[Boost-commit] svn:boost r81444 - in trunk/boost: chrono signals2 signals2/detail

Subject: [Boost-commit] svn:boost r81444 - in trunk/boost: chrono signals2 signals2/detail
From: marshall_at_[hidden]
Date: 2012-11-20 16:18:03

Author: marshall
Date: 2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
New Revision: 81444
URL: http://svn.boost.org/trac/boost/changeset/81444

Log:
Remove usage of deprecated macros
Text files modified: 
   trunk/boost/chrono/config.hpp                         |     2 +-                                      
   trunk/boost/signals2/deconstruct.hpp                  |    10 +++++-----                              
   trunk/boost/signals2/detail/signal_template.hpp       |    24 ++++++++++++------------                
   trunk/boost/signals2/detail/signals_common_macros.hpp |     6 +++---                                  
   trunk/boost/signals2/detail/slot_template.hpp         |    12 ++++++------                            
   trunk/boost/signals2/signal.hpp                       |     2 +-                                      
   trunk/boost/signals2/slot.hpp                         |     2 +-                                      
   7 files changed, 29 insertions(+), 29 deletions(-)

Modified: trunk/boost/chrono/config.hpp
==============================================================================
--- trunk/boost/chrono/config.hpp	(original)
+++ trunk/boost/chrono/config.hpp	2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
@@ -130,7 +130,7 @@
 #if defined( BOOST_NO_CXX11_NUMERIC_LIMITS )
 #  define BOOST_CHRONO_LIB_NOEXCEPT_OR_THROW throw()
 #else
-#ifdef BOOST_NO_NOEXCEPT
+#ifdef BOOST_NO_CXX11_NOEXCEPT
 #  define BOOST_CHRONO_LIB_NOEXCEPT_OR_THROW throw()
 #else
 #  define BOOST_CHRONO_LIB_NOEXCEPT_OR_THROW noexcept

Modified: trunk/boost/signals2/deconstruct.hpp
==============================================================================
--- trunk/boost/signals2/deconstruct.hpp	(original)
+++ trunk/boost/signals2/deconstruct.hpp	2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
@@ -63,7 +63,7 @@
         }
         return _sp;
     }
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     template<class... Args>
       const shared_ptr<T>& postconstruct(Args && ... args)
     {
@@ -75,7 +75,7 @@
         }
         return _sp;
     }
-#else // !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#else // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     template<typename A1>
       const shared_ptr<T>& postconstruct(const A1 &a1) const
     {
@@ -183,7 +183,7 @@
         }
         return _sp;
     }
-#endif // !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#endif // !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 private:
     friend class boost::signals2::deconstruct_access;
     postconstructor_invoker(const shared_ptr<T> & sp):
@@ -284,7 +284,7 @@
 
     }
 
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 
     // Variadic templates, rvalue reference
 
@@ -472,7 +472,7 @@
     return deconstruct_access::deconstruct<T>();
 }
 
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 
 // Variadic templates, rvalue reference
 

Modified: trunk/boost/signals2/detail/signal_template.hpp
==============================================================================
--- trunk/boost/signals2/detail/signal_template.hpp	(original)
+++ trunk/boost/signals2/detail/signal_template.hpp	2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
@@ -13,7 +13,7 @@
 
 // This file is included iteratively, and should not be protected from multiple inclusion
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 #define BOOST_SIGNALS2_NUM_ARGS BOOST_PP_ITERATION()
 #else
 #define BOOST_SIGNALS2_NUM_ARGS 1
@@ -132,11 +132,11 @@
         typedef BOOST_SIGNALS2_EXTENDED_SLOT_TYPE(BOOST_SIGNALS2_NUM_ARGS) extended_slot_type;
         typedef typename nonvoid<typename slot_function_type::result_type>::type nonvoid_slot_result_type;
       private:
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
         class slot_invoker;
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
         typedef variadic_slot_invoker<nonvoid_slot_result_type, Args...> slot_invoker;
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
         typedef slot_call_iterator_cache<nonvoid_slot_result_type, slot_invoker> slot_call_iterator_cache_type;
         typedef typename group_key<Group>::type group_key_type;
         typedef shared_ptr<connection_body<group_key_type, slot_type, Mutex> > connection_body_type;
@@ -311,7 +311,7 @@
         typedef Mutex mutex_type;
 
         // slot_invoker is passed to slot_call_iterator_t to run slots
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
         class slot_invoker
         {
         public:
@@ -371,7 +371,7 @@
 #undef BOOST_SIGNALS2_M_ARG_NAMES
 #undef BOOST_SIGNALS2_M_ARG_NAME
 
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
         // a struct used to optimize (minimize) the number of shared_ptrs that need to be created
         // inside operator()
         class invocation_state
@@ -618,7 +618,7 @@
         slot_call_iterator;
       typedef typename mpl::identity<BOOST_SIGNALS2_SIGNATURE_FUNCTION_TYPE(BOOST_SIGNALS2_NUM_ARGS)>::type signature_type;
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
 // typedef Tn argn_type;
 #define BOOST_SIGNALS2_MISC_STATEMENT(z, n, data) \
@@ -640,7 +640,7 @@
 
       BOOST_STATIC_CONSTANT(int, arity = BOOST_SIGNALS2_NUM_ARGS);
 
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
       template<unsigned n> class arg
       {
@@ -649,7 +649,7 @@
       };
       BOOST_STATIC_CONSTANT(int, arity = sizeof...(Args));
 
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
       BOOST_SIGNALS2_SIGNAL_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const combiner_type &combiner_arg = combiner_type(),
         const group_compare_type &group_compare = group_compare_type()):
@@ -766,11 +766,11 @@
           <BOOST_SIGNALS2_SIGNAL_TEMPLATE_INSTANTIATION> > _weak_pimpl;
       };
 
-#ifndef BOOST_NO_VARIADIC_TEMPLATES
+#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
       template<int arity, typename Signature>
         class extended_signature: public variadic_extended_signature<Signature>
       {};
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
       template<int arity, typename Signature>
         class extended_signature;
       // partial template specialization
@@ -810,7 +810,7 @@
           GroupCompare, SlotFunction, ExtendedSlotFunction, Mutex> type;
       };
 
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
     } // namespace detail
   } // namespace signals2

Modified: trunk/boost/signals2/detail/signals_common_macros.hpp
==============================================================================
--- trunk/boost/signals2/detail/signals_common_macros.hpp	(original)
+++ trunk/boost/signals2/detail/signals_common_macros.hpp	2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
@@ -13,7 +13,7 @@
 
 #include <boost/config.hpp>
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
 #ifndef BOOST_SIGNALS2_MAX_ARGS
 #define BOOST_SIGNALS2_MAX_ARGS 9
@@ -139,7 +139,7 @@
 
 #define BOOST_SIGNALS2_PP_COMMA_IF(arity) BOOST_PP_COMMA_IF(arity)
 
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
 #define BOOST_SIGNALS2_SIGNAL_CLASS_NAME(arity) signal
 #define BOOST_SIGNALS2_WEAK_SIGNAL_CLASS_NAME(arity) weak_signal
@@ -208,6 +208,6 @@
 
 #define BOOST_SIGNALS2_PP_COMMA_IF(arity) ,
 
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
 #endif // BOOST_SIGNALS2_SIGNALS_COMMON_MACROS_HPP

Modified: trunk/boost/signals2/detail/slot_template.hpp
==============================================================================
--- trunk/boost/signals2/detail/slot_template.hpp	(original)
+++ trunk/boost/signals2/detail/slot_template.hpp	2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
@@ -11,7 +11,7 @@
 
 // This file is included iteratively, and should not be protected from multiple inclusion
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 #define BOOST_SIGNALS2_NUM_ARGS BOOST_PP_ITERATION()
 #else
 #define BOOST_SIGNALS2_NUM_ARGS 1
@@ -42,7 +42,7 @@
       typedef R result_type;
       typedef typename mpl::identity<BOOST_SIGNALS2_SIGNATURE_FUNCTION_TYPE(BOOST_SIGNALS2_NUM_ARGS)>::type signature_type;
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
 // typedef Tn argn_type;
 #define BOOST_SIGNALS2_MISC_STATEMENT(z, n, data) \
@@ -64,7 +64,7 @@
 
       BOOST_STATIC_CONSTANT(int, arity = BOOST_SIGNALS2_NUM_ARGS);
 
-#else // BOOST_NO_VARIADIC_TEMPLATES
+#else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
       template<unsigned n> class arg
       {
@@ -73,7 +73,7 @@
       };
       BOOST_STATIC_CONSTANT(int, arity = sizeof...(Args));
 
-#endif // BOOST_NO_VARIADIC_TEMPLATES
+#endif // BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
       template<typename F>
       BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const F& f)
@@ -81,7 +81,7 @@
         init_slot_function(f);
       }
       // copy constructors
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
       template<BOOST_SIGNALS2_PREFIXED_SIGNATURE_TEMPLATE_DECL(BOOST_SIGNALS2_NUM_ARGS, Other), typename OtherSlotFunction>
       BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)(const BOOST_SIGNALS2_SLOT_CLASS_NAME(BOOST_SIGNALS2_NUM_ARGS)
         <BOOST_SIGNALS2_PREFIXED_SIGNATURE_TEMPLATE_INSTANTIATION(BOOST_SIGNALS2_NUM_ARGS, Other), OtherSlotFunction> &other_slot):
@@ -161,7 +161,7 @@
       SlotFunction _slot_function;
     };
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
     namespace detail
     {
       template<unsigned arity, typename Signature, typename SlotFunction>

Modified: trunk/boost/signals2/signal.hpp
==============================================================================
--- trunk/boost/signals2/signal.hpp	(original)
+++ trunk/boost/signals2/signal.hpp	2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
@@ -32,7 +32,7 @@
 #include <boost/throw_exception.hpp>
 #include <functional>
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 #include <boost/signals2/preprocessed_signal.hpp>
 #else
 #include <boost/signals2/variadic_signal.hpp>

Modified: trunk/boost/signals2/slot.hpp
==============================================================================
--- trunk/boost/signals2/slot.hpp	(original)
+++ trunk/boost/signals2/slot.hpp	2012-11-20 16:18:02 EST (Tue, 20 Nov 2012)
@@ -24,7 +24,7 @@
 #include <boost/visit_each.hpp>
 #include <boost/weak_ptr.hpp>
 
-#ifdef BOOST_NO_VARIADIC_TEMPLATES
+#ifdef BOOST_NO_CXX11_VARIADIC_TEMPLATES
 #include <boost/signals2/preprocessed_slot.hpp>
 #else
 #include <boost/signals2/variadic_slot.hpp>