Skip to content

Commit 79e197b

Browse files
ryanofskyfanquake
authored andcommitted
build: Suppress warnings from boost and capnproto in multiprocess code
Without this change there are errors from boost like: /ci_container_base/depends/i686-pc-linux-gnu/include/boost/signals2/expired_slot.hpp:23:28: error: 'what' overrides a member function but is not marked 'override' [-Werror,-Wsuggest-override] /ci_container_base/depends/i686-pc-linux-gnu/include/boost/signals2/detail/signal_template.hpp:750:32: error: 'lock_pimpl' overrides a member function but is not marked 'override' [-Werror,-Wsuggest-override] /ci_container_base/depends/i686-pc-linux-gnu/include/boost/signals2/connection.hpp:150:22: error: 'connected' overrides a member function but is not marked 'override' [-Werror,-Wsuggest-override] There do not seem to be errors from capnproto currently, but add a suppression for it, too, to be consistent with other libraries.
1 parent a961ad1 commit 79e197b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

configure.ac

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,6 +1392,9 @@ if test "$with_libmultiprocess" = "yes" || test "$with_libmultiprocess" = "auto"
13921392
PKG_CHECK_MODULES([LIBMULTIPROCESS], [libmultiprocess], [
13931393
libmultiprocess_found=yes;
13941394
libmultiprocess_prefix=`$PKG_CONFIG --variable=prefix libmultiprocess`;
1395+
if test "$suppress_external_warnings" != "no" ; then
1396+
LIBMULTIPROCESS_CFLAGS=SUPPRESS_WARNINGS($LIBMULTIPROCESS_CFLAGS)
1397+
fi
13951398
], [true])
13961399
elif test "$with_libmultiprocess" != "no"; then
13971400
AC_MSG_ERROR([--with-libmultiprocess=$with_libmultiprocess value is not yes, auto, or no])

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ libbitcoin_ipc_a_SOURCES = \
10881088
ipc/process.cpp \
10891089
ipc/process.h \
10901090
ipc/protocol.h
1091-
libbitcoin_ipc_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
1091+
libbitcoin_ipc_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BOOST_CPPFLAGS)
10921092
libbitcoin_ipc_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS) $(LIBMULTIPROCESS_CFLAGS)
10931093

10941094
include $(MPGEN_PREFIX)/include/mpgen.mk

0 commit comments

Comments
 (0)