Merge pull request #316 from odin-detector/fix-boost-bind

Add version-dependent mechanism to avoid boost global placeholder deprecation
odin-detector · Jun 8, 2023 · 4ab601c · 4ab601c
2 parents b1236c7 + 230db5d
commit 4ab601c
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 3 deletions.
diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -81,6 +81,18 @@ find_package(PCAP 1.4.0 REQUIRED)
 find_package(Blosc)
 find_package(Kafka)
 
+# Check if Boost version has placeholders and set definition accordingly
+message("\nChecking Boost version placeholder support")
+if (NOT DEFINED Boost_VERSION_STRING)
+  set(Boost_VERSION_STRING "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
+endif ()
+if ((Boost_VERSION_STRING EQUAL 1.60.0) OR (Boost_VERSION_STRING GREATER 1.60.0))
+  message(STATUS "Boost version ${Boost_VERSION_STRING} has placeholders")
+  ADD_DEFINITIONS(-DBOOST_HAS_PLACEHOLDERS)
+else ()
+  message(STATUS "Boost version ${Boost_VERSION_STRING} does not have placeholders")
+endif ()
+
 # find package HDF5
 # FindHDF5.cmake is essentially broken and does not allow
 # to properly override the search path by setting HDF5_ROOT.

diff --git a/cpp/common/include/IpcChannel.h b/cpp/common/include/IpcChannel.h
@@ -12,7 +12,7 @@
 #include <map>
 
 #include "zmq/zmq.hpp"
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 
 namespace OdinData

diff --git a/cpp/common/include/IpcReactor.h b/cpp/common/include/IpcReactor.h
@@ -22,7 +22,7 @@
 #include <map>
 #include <time.h>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/function.hpp>
 #include <boost/ref.hpp>
 #include <boost/shared_ptr.hpp>

diff --git a/cpp/frameProcessor/src/FileWriterPlugin.cpp b/cpp/frameProcessor/src/FileWriterPlugin.cpp
@@ -16,6 +16,10 @@
 #include "DebugLevelLogger.h"
 #include "version.h"
 
+#ifdef BOOST_HAS_PLACEHOLDERS
+using namespace boost::placeholders;
+#endif
+
 namespace FrameProcessor
 {
 

diff --git a/cpp/frameProcessor/test/FrameProcessorTest.cpp b/cpp/frameProcessor/test/FrameProcessorTest.cpp
@@ -5,6 +5,11 @@
 #include "DebugLevelLogger.h"
 
 #include <boost/test/unit_test.hpp>
+#include <boost/bind/bind.hpp>
+#ifdef BOOST_HAS_PLACEHOLDERS
+using namespace boost::placeholders;
+#endif
+
 #include <log4cxx/logger.h>
 #include <log4cxx/xml/domconfigurator.h>
 #include <log4cxx/simplelayout.h>

diff --git a/cpp/frameReceiver/src/FrameReceiverRxThread.cpp b/cpp/frameReceiver/src/FrameReceiverRxThread.cpp
@@ -7,6 +7,10 @@
 
 #include "FrameReceiverRxThread.h"
 
+#ifdef BOOST_HAS_PLACEHOLDERS
+using namespace boost::placeholders;
+#endif
+
 using namespace FrameReceiver;
 
 //! Constructor for the FrameReceiverRxThread class.

diff --git a/cpp/test/integrationTest/src/CMakeLists.txt b/cpp/test/integrationTest/src/CMakeLists.txt
@@ -1,6 +1,6 @@
 
 set(CMAKE_INCLUDE_CURRENT_DIR on)
-ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK)
+ADD_DEFINITIONS(-DBOOST_TEST_DYN_LINK -DBOOST_BIND_GLOBAL_PLACEHOLDERS)
 
 include_directories(${TEST_DIR}/integrationTest/include
 		${TEST_INCLUDE_DIRS}