fix(sdk): Silence boost warnings

FairRootGroup · Jul 7, 2021 · e2de214 · e2de214
1 parent 09d2574
commit e2de214
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 6 deletions.
diff --git a/fairmq/JSONParser.cxx b/fairmq/JSONParser.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (C) 2014-2018 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
+ * Copyright (C) 2014-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -19,7 +19,9 @@
 
 #include <fairlogger/Logger.h>
 
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <boost/property_tree/json_parser.hpp>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <boost/property_tree/ptree.hpp>
 #include <boost/any.hpp>
 

diff --git a/fairmq/plugins/DDS/DDS.h b/fairmq/plugins/DDS/DDS.h
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2017 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2017-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -14,7 +14,9 @@
 #include <fairmq/Version.h>
 #include <fairmq/sdk/commands/Commands.h>
 
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <dds/dds.h>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 
 #include <boost/asio/executor.hpp>
 #include <boost/asio/executor_work_guard.hpp>

diff --git a/fairmq/sdk/DDSEnvironment.cxx b/fairmq/sdk/DDSEnvironment.cxx
@@ -9,7 +9,9 @@
 #include "DDSEnvironment.h"
 
 #include <cstdlib>
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <dds/dds.h>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <fairlogger/Logger.h>
 #include <fairmq/tools/InstanceLimit.h>
 #include <fairmq/sdk/DDSInfo.h>

diff --git a/fairmq/sdk/DDSSession.cxx b/fairmq/sdk/DDSSession.cxx
@@ -12,13 +12,15 @@
 #include <boost/uuid/uuid_io.hpp>
 #include <cassert>
 #include <cstdlib>
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <dds/dds.h>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <fairlogger/Logger.h>
-#include <fairmq/tools/Strings.h>
-#include <fairmq/tools/Semaphore.h>
 #include <fairmq/sdk/DDSAgent.h>
 #include <fairmq/sdk/DDSEnvironment.h>
 #include <fairmq/sdk/DDSTopology.h>
+#include <fairmq/tools/Semaphore.h>
+#include <fairmq/tools/Strings.h>
 #include <mutex>
 #include <sstream>
 #include <thread>

diff --git a/fairmq/sdk/DDSTopology.cxx b/fairmq/sdk/DDSTopology.cxx
@@ -9,7 +9,9 @@
 #include "DDSTopology.h"
 
 #include <boost/range/iterator_range.hpp>
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <dds/dds.h>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <fairlogger/Logger.h>
 #include <fairmq/sdk/DDSEnvironment.h>
 #include <memory>

diff --git a/fairmq/sdk/Topology.cxx b/fairmq/sdk/Topology.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -8,7 +8,9 @@
 
 #include "Topology.h"
 
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <dds/dds.h>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 
 namespace fair::mq::sdk
 {

diff --git a/test/sdk/_dds.cxx b/test/sdk/_dds.cxx
@@ -8,7 +8,9 @@
 
 #include "Fixtures.h"
 
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <dds/dds.h>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 
 namespace {
 

diff --git a/test/sdk/_topology.cxx b/test/sdk/_topology.cxx
@@ -1,5 +1,5 @@
 /********************************************************************************
- *    Copyright (C) 2019 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH    *
+ * Copyright (C) 2019-2021 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  *
  *                                                                              *
  *              This software is distributed under the terms of the             *
  *              GNU Lesser General Public Licence (LGPL) version 3,             *
@@ -9,7 +9,9 @@
 #include "Fixtures.h"
 
 #include <asio.hpp>
+#define BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <dds/dds.h>
+#undef BOOST_BIND_GLOBAL_PLACEHOLDERS
 #include <fairmq/sdk/Topology.h>
 #include <fairmq/tools/Strings.h>
 #include <fairmq/tools/Semaphore.h>