Avoid Boost Config macros only available in Boost 1.50 and later

Signed-off-by: Johannes Meyer <johannes@intermodalics.eu>
orocos-toolchain · Jan 16, 2017 · caacd28 · caacd28
1 parent acaced1
commit caacd28
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/rtt/types/PropertyDecomposition.cpp b/rtt/types/PropertyDecomposition.cpp
@@ -48,7 +48,6 @@
 #include <vector>
 #include <string>
 #include <memory>
-#include <boost/config.hpp>
 #include <boost/lexical_cast.hpp>
 #include "../Logger.hpp"
 #include "TypeInfo.hpp"
@@ -104,7 +103,7 @@ bool typeDecomposition( base::DataSourceBase::shared_ptr dsb, PropertyBag& targe
     targetbag.setType( dsb->getTypeName() );
 
     // needed for recursion.
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if __cplusplus > 199711L
     unique_ptr< Property<PropertyBag> >
 #else
     auto_ptr< Property<PropertyBag> >

diff --git a/tests/corba_ipc_test.cpp b/tests/corba_ipc_test.cpp
@@ -39,8 +39,6 @@
 #include <string>
 #include <stdlib.h>
 
-#include <boost/config.hpp>
-
 using namespace RTT;
 using namespace RTT::detail;
 
@@ -551,7 +549,7 @@ BOOST_AUTO_TEST_CASE( testPortProxying )
     BOOST_CHECK(!write_port->connected());
 
     // Test cloning
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if __cplusplus > 199711L
     unique_ptr<base::InputPortInterface>
 #else
     auto_ptr<base::InputPortInterface>

diff --git a/tests/corba_test.cpp b/tests/corba_test.cpp
@@ -37,7 +37,6 @@
 
 #include "operations_fixture.hpp"
 
-#include <boost/config.hpp>
 #include <memory>
 
 using namespace std;
@@ -610,7 +609,7 @@ BOOST_AUTO_TEST_CASE( testSharedConnections )
     // This test installs shared connections between mo1 and mo2 as writers and mi2 and mi3 as readers
 
 //    // Add a second input port mo3 to tc
-//#ifndef BOOST_NO_CXX11_SMART_PTR
+//#if __cplusplus > 199711L
 //    unique_ptr<RTT::OutputPort<double> >
 //#else
 //    auto_ptr<RTT::OutputPort<double> >
@@ -620,7 +619,7 @@ BOOST_AUTO_TEST_CASE( testSharedConnections )
 //    tc->addPort("mo3", *mo3);
 
     // Add a second input port mi3 to t2
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if __cplusplus > 199711L
     unique_ptr<RTT::InputPort<double> >
 #else
     auto_ptr<RTT::InputPort<double> >
@@ -785,7 +784,7 @@ BOOST_AUTO_TEST_CASE( testPortProxying )
     BOOST_CHECK(!write_port->connected());
 
     // Test cloning
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if __cplusplus > 199711L
     unique_ptr<base::InputPortInterface>
 #else
     auto_ptr<base::InputPortInterface>

diff --git a/tests/ports_test.cpp b/tests/ports_test.cpp
@@ -26,7 +26,6 @@
 #include <extras/SimulationActivity.hpp>
 #include <extras/SimulationThread.hpp>
 
-#include <boost/config.hpp>
 #include <boost/function_types/function_type.hpp>
 #include <OperationCaller.hpp>
 
@@ -132,7 +131,7 @@ BOOST_AUTO_TEST_CASE( testPortTaskInterface )
     // We're adding the above ports to another TC as well.
     // This is not supported behavior, as it will 'overtake' ownership,
      {
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if __cplusplus > 199711L
         unique_ptr<TaskContext> tc1(new TaskContext( "tc", TaskContext::Stopped ));
         unique_ptr<TaskContext> tc2(new TaskContext( "tc2", TaskContext::Stopped ));
 #else
@@ -1045,7 +1044,7 @@ BOOST_AUTO_TEST_CASE(testPlainPortNotSignalling)
 BOOST_AUTO_TEST_CASE(testPortDataSource)
 {
     OutputPort<int> wp1("Write");
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if __cplusplus > 199711L
     unique_ptr<InputPortInterface>
 #else
     auto_ptr<InputPortInterface>

diff --git a/tests/specialized_activities.cpp b/tests/specialized_activities.cpp
@@ -12,7 +12,6 @@
 #include <extras/FileDescriptorActivity.hpp>
 #include <iostream>
 #include <memory>
-#include <boost/config.hpp>
 
 #include <rtt-detail-fwd.hpp>
 using namespace RTT::detail;
@@ -57,7 +56,7 @@ BOOST_FIXTURE_TEST_SUITE(SecializedActivitiesSuite,SpecializedActivities)
 
 BOOST_AUTO_TEST_CASE( testFileDescriptorActivity )
 {
-#ifndef BOOST_NO_CXX11_SMART_PTR
+#if __cplusplus > 199711L
     unique_ptr<TestFDActivity>
 #else
     auto_ptr<TestFDActivity>