Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r81562 - in trunk/libs/signals2: doc test
From: marshall_at_[hidden]
Date: 2012-11-26 12:38:51


Author: marshall
Date: 2012-11-26 12:38:50 EST (Mon, 26 Nov 2012)
New Revision: 81562
URL: http://svn.boost.org/trac/boost/changeset/81562

Log:
Removed usage of deprecated macros
Text files modified:
   trunk/libs/signals2/doc/porting.xml | 2 +-
   trunk/libs/signals2/test/signal_n_test.cpp | 6 +++---
   trunk/libs/signals2/test/track_test.cpp | 4 ++--
   3 files changed, 6 insertions(+), 6 deletions(-)

Modified: trunk/libs/signals2/doc/porting.xml
==============================================================================
--- trunk/libs/signals2/doc/porting.xml (original)
+++ trunk/libs/signals2/doc/porting.xml 2012-11-26 12:38:50 EST (Mon, 26 Nov 2012)
@@ -270,7 +270,7 @@
       <para>
         The following library features are
         deprecated, and are only available if your compiler is NOT using
- variadic templates (i.e. BOOST_NO_VARIADIC_TEMPLATES is defined
+ variadic templates (i.e. BOOST_NO_CXX11_VARIADIC_TEMPLATES is defined
         by Boost.Config).
         <itemizedlist>
           <listitem>

Modified: trunk/libs/signals2/test/signal_n_test.cpp
==============================================================================
--- trunk/libs/signals2/test/signal_n_test.cpp (original)
+++ trunk/libs/signals2/test/signal_n_test.cpp 2012-11-26 12:38:50 EST (Mon, 26 Nov 2012)
@@ -10,12 +10,12 @@
 #include <boost/config.hpp>
 #include <boost/test/minimal.hpp>
 
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 int test_main(int, char* [])
 {
   return 0;
 }
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
 #include <boost/optional.hpp>
 #include <boost/ref.hpp>
@@ -300,4 +300,4 @@
   return 0;
 }
 
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES

Modified: trunk/libs/signals2/test/track_test.cpp
==============================================================================
--- trunk/libs/signals2/test/track_test.cpp (original)
+++ trunk/libs/signals2/test/track_test.cpp 2012-11-26 12:38:50 EST (Mon, 26 Nov 2012)
@@ -111,8 +111,8 @@
   BOOST_CHECK(s1(2) == 0);
 
 // there isn't a boost config macro that detects the existance of std::shared_ptr or std::weak_ptr,
-// so we rely on BOOST_NO_VARIADIC_TEMPLATES as a hack
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+// so we rely on BOOST_NO_CXX11_VARIADIC_TEMPLATES as a hack
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
   // Test tracking through std::shared_ptr/weak_ptr
   BOOST_CHECK(s1(5) == 0);
   {


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk