[Boost-commit] svn:boost r81442 - in trunk/boost: detail random random/detail

Subject: [Boost-commit] svn:boost r81442 - in trunk/boost: detail random random/detail
From: marshall_at_[hidden]
Date: 2012-11-20 14:44:25

Author: marshall
Date: 2012-11-20 14:44:24 EST (Tue, 20 Nov 2012)
New Revision: 81442
URL: http://svn.boost.org/trac/boost/changeset/81442

Log:
Remove usage of deprecated macros
Text files modified: 
   trunk/boost/detail/scoped_enum_emulation.hpp |    20 ++++++++++----------                    
   trunk/boost/random/detail/integer_log2.hpp   |     4 ++--                                    
   trunk/boost/random/discard_block.hpp         |     2 +-                                      
   trunk/boost/random/shuffle_order.hpp         |     2 +-                                      
   4 files changed, 14 insertions(+), 14 deletions(-)

Modified: trunk/boost/detail/scoped_enum_emulation.hpp
==============================================================================
--- trunk/boost/detail/scoped_enum_emulation.hpp	(original)
+++ trunk/boost/detail/scoped_enum_emulation.hpp	2012-11-20 14:44:24 EST (Tue, 20 Nov 2012)
@@ -11,7 +11,7 @@
 [section:scoped_enums Scoped Enums]
 
 Generates C++0x scoped enums if the feature is present, otherwise emulates C++0x
-scoped enums with C++03 namespaces and enums. The Boost.Config BOOST_NO_SCOPED_ENUMS
+scoped enums with C++03 namespaces and enums. The Boost.Config BOOST_NO_CXX11_SCOPED_ENUMS
 macro is used to detect feature support.
 
 See http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2347.pdf for a
@@ -71,14 +71,14 @@
 
 And instead of
 
-    #ifdef BOOST_NO_SCOPED_ENUMS
+    #ifdef BOOST_NO_CXX11_SCOPED_ENUMS
     template <>
     struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc> : public true_type { };
     #endif
 
 use
 
-    #ifdef BOOST_NO_SCOPED_ENUMS
+    #ifdef BOOST_NO_CXX11_SCOPED_ENUMS
     template <>
     struct BOOST_SYMBOL_VISIBLE is_error_code_enum<future_errc::enum_type > : public true_type { };
     #endif
@@ -130,7 +130,7 @@
 namespace boost
 {
 
-#ifdef BOOST_NO_SCOPED_ENUMS
+#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
   /**
    * Meta-function to get the underlying type of a scoped enum.
    *
@@ -193,7 +193,7 @@
     return e.native_value_();
   }
 
-#else  // BOOST_NO_SCOPED_ENUMS
+#else  // BOOST_NO_CXX11_SCOPED_ENUMS
 
   template <typename EnumType>
   struct underlying_type
@@ -224,9 +224,9 @@
 }
 
 
-#ifdef BOOST_NO_SCOPED_ENUMS
+#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
 
-#ifndef BOOST_NO_EXPLICIT_CONVERSION_OPERATORS
+#ifndef BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS
 
 #define BOOST_SCOPED_ENUM_UT_DECLARE_CONVERSION_OPERATOR \
      explicit operator underlying_type() const { return get_underlying_value_(); }
@@ -305,7 +305,7 @@
  */
 #define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) struct EnumType
 
-#else  // BOOST_NO_SCOPED_ENUMS
+#else  // BOOST_NO_CXX11_SCOPED_ENUMS
 
 #define BOOST_SCOPED_ENUM_UT_DECLARE_BEGIN(EnumType,UnderlyingType) enum class EnumType:UnderlyingType
 #define BOOST_SCOPED_ENUM_DECLARE_BEGIN(EnumType) enum class EnumType
@@ -315,13 +315,13 @@
 #define BOOST_SCOPED_ENUM_NATIVE(EnumType) EnumType
 #define BOOST_SCOPED_ENUM_FORWARD_DECLARE(EnumType) enum class EnumType
 
-#endif  // BOOST_NO_SCOPED_ENUMS
+#endif  // BOOST_NO_CXX11_SCOPED_ENUMS
 
 #define BOOST_SCOPED_ENUM_START(name) BOOST_SCOPED_ENUM_DECLARE_BEGIN(name)
 #define BOOST_SCOPED_ENUM_END BOOST_SCOPED_ENUM_DECLARE_END2()
 #define BOOST_SCOPED_ENUM(name) BOOST_SCOPED_ENUM_NATIVE(name)
 
-//#ifdef BOOST_NO_SCOPED_ENUMS
+//#ifdef BOOST_NO_CXX11_SCOPED_ENUMS
 //
 //# define BOOST_SCOPED_ENUM_START(name) struct name { enum enum_type
 //# define BOOST_SCOPED_ENUM_END };

Modified: trunk/boost/random/detail/integer_log2.hpp
==============================================================================
--- trunk/boost/random/detail/integer_log2.hpp	(original)
+++ trunk/boost/random/detail/integer_log2.hpp	2012-11-20 14:44:24 EST (Tue, 20 Nov 2012)
@@ -22,7 +22,7 @@
 namespace random {
 namespace detail {
 
-#if !defined(BOOST_NO_CONSTEXPR)
+#if !defined(BOOST_NO_CXX11_CONSTEXPR)
 #define BOOST_RANDOM_DETAIL_CONSTEXPR constexpr
 #elif defined(BOOST_MSVC)
 #define BOOST_RANDOM_DETAIL_CONSTEXPR __forceinline
@@ -35,7 +35,7 @@
 template<int Shift>
 struct integer_log2_impl
 {
-#if defined(BOOST_NO_CONSTEXPR)
+#if defined(BOOST_NO_CXX11_CONSTEXPR)
     template<class T>
     BOOST_RANDOM_DETAIL_CONSTEXPR static int apply(T t, int accum)
     {

Modified: trunk/boost/random/discard_block.hpp
==============================================================================
--- trunk/boost/random/discard_block.hpp	(original)
+++ trunk/boost/random/discard_block.hpp	2012-11-20 14:44:24 EST (Tue, 20 Nov 2012)
@@ -62,7 +62,7 @@
     /** Constructs a new \discard_block_engine with a copy of rng. */
     explicit discard_block_engine(const base_type & rng) : _rng(rng), _n(0) { }
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     /** Constructs a new \discard_block_engine with rng. */
     explicit discard_block_engine(base_type && rng) : _rng(rng), _n(0) { }
 #endif

Modified: trunk/boost/random/shuffle_order.hpp
==============================================================================
--- trunk/boost/random/shuffle_order.hpp	(original)
+++ trunk/boost/random/shuffle_order.hpp	2012-11-20 14:44:24 EST (Tue, 20 Nov 2012)
@@ -98,7 +98,7 @@
      */
     explicit shuffle_order_engine(const base_type & rng) : _rng(rng) { init(); }
 
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
     explicit shuffle_order_engine(base_type&& rng) : _rng(rng) { init(); }
 #endif