From 2adc574d7b3647144133dd4cb8fcd456d5841ce2 Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Jun 10 2020 19:23:47 +0000 Subject: Fix boost::placeholders import --- diff --git a/dds.spec b/dds.spec index f71fe51..ca1cd65 100644 --- a/dds.spec +++ b/dds.spec @@ -15,6 +15,10 @@ Patch2: fix_install_destinations.patch %if 0%{?suse_version} == 1500 Patch3: relax_boost_requirement.patch %endif +%if 0%{?fedora} > 32 +# https://github.com/FairRootGroup/DDS/issues/305 +Patch3: fix_boost_bind_placeholders.patch +%endif BuildRequires: boost-devel %if 0%{?suse_version} @@ -97,5 +101,6 @@ This package contains the header files and CMake package for developing against - Relax Boost version requirement (to support opensuse-leap-15.2) - Build wn_bin target - Fix suse detection on tumbleweed +- Fix boost::placeholders import * Tue Jun 9 2020 Dennis Klein - 3.2-1 - Package 3.2 diff --git a/fix_boost_bind_placeholders.patch b/fix_boost_bind_placeholders.patch new file mode 100644 index 0000000..f7f95fa --- /dev/null +++ b/fix_boost_bind_placeholders.patch @@ -0,0 +1,20 @@ +diff --git a/dds-agent/src/CommanderChannel.cpp b/dds-agent/src/CommanderChannel.cpp +index 7b74da6..2ec7873 100644 +--- a/dds-agent/src/CommanderChannel.cpp ++++ b/dds-agent/src/CommanderChannel.cpp +@@ -8,6 +8,7 @@ + #include "EnvProp.h" + #include "UserDefaults.h" + // BOOST ++#include + #include + + using namespace MiscCommon; +@@ -18,6 +19,7 @@ using namespace std; + using namespace user_defaults_api; + using namespace topology_api; + namespace fs = boost::filesystem; ++using namespace boost::placeholders; + + const uint16_t g_MaxConnectionAttempts = 5; +