[Boost-commit] svn:boost r86175 - trunk/boost/geometry/index/detail

Subject: [Boost-commit] svn:boost r86175 - trunk/boost/geometry/index/detail
From: adam.wulkiewicz_at_[hidden]
Date: 2013-10-06 08:39:17

Author: awulkiew
Date: 2013-10-06 08:39:17 EDT (Sun, 06 Oct 2013)
New Revision: 86175
URL: http://svn.boost.org/trac/boost/changeset/86175

Log:
[geometry][index]: BOOST_NO_* deprecated macros replaced.

Text files modified: 
   trunk/boost/geometry/index/detail/varray.hpp        |     4 ++--                                    
   trunk/boost/geometry/index/detail/varray_detail.hpp |    10 +++++-----                              
   2 files changed, 7 insertions(+), 7 deletions(-)

Modified: trunk/boost/geometry/index/detail/varray.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/varray.hpp	Sun Oct  6 04:03:35 2013	(r86174)
+++ trunk/boost/geometry/index/detail/varray.hpp	2013-10-06 08:39:17 EDT (Sun, 06 Oct 2013)	(r86175)
@@ -178,7 +178,7 @@
 
     BOOST_COPYABLE_AND_MOVABLE(varray)
 
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
 public:
     template <std::size_t C>
     varray & operator=(varray<Value, C> & sv)
@@ -364,7 +364,7 @@
     //!   Linear O(N).
     template <std::size_t C>
 // TEMPORARY WORKAROUND
-#if defined(BOOST_NO_RVALUE_REFERENCES)
+#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     varray & operator=(::boost::rv< varray<value_type, C> > const& other)
 #else
     varray & operator=(varray<value_type, C> const& other)

Modified: trunk/boost/geometry/index/detail/varray_detail.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/varray_detail.hpp	Sun Oct  6 04:03:35 2013	(r86174)
+++ trunk/boost/geometry/index/detail/varray_detail.hpp	2013-10-06 08:39:17 EDT (Sun, 06 Oct 2013)	(r86175)
@@ -600,7 +600,7 @@
 // Needed by emplace_back() and emplace()
 
 #if !defined(BOOST_CONTAINER_VARRAY_DISABLE_EMPLACE)
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 
 template <typename DisableTrivialInit, typename I, class ...Args>
 inline
@@ -612,10 +612,10 @@
     new (static_cast<void*>(boost::addressof(*pos))) V(::boost::forward<Args>(args)...);    // may throw
 }
 
-#else // !BOOST_NO_VARIADIC_TEMPLATES
+#else // !BOOST_NO_CXX11_VARIADIC_TEMPLATES
 
-// BOOST_NO_RVALUE_REFERENCES -> P0 const& p0
-// !BOOST_NO_RVALUE_REFERENCES -> P0 && p0
+// BOOST_NO_CXX11_RVALUE_REFERENCES -> P0 const& p0
+// !BOOST_NO_CXX11_RVALUE_REFERENCES -> P0 && p0
 // which means that version with one parameter may take V const& v
 
 #define BOOST_PP_LOCAL_MACRO(n)                                                                     \
@@ -635,7 +635,7 @@
 #define BOOST_PP_LOCAL_LIMITS (1, BOOST_CONTAINER_MAX_CONSTRUCTOR_PARAMETERS)
 #include BOOST_PP_LOCAL_ITERATE()
 
-#endif // !BOOST_NO_VARIADIC_TEMPLATES
+#endif // !BOOST_NO_CXX11_VARIADIC_TEMPLATES
 #endif // !BOOST_CONTAINER_VARRAY_DISABLE_EMPLACE
 
 // assign(I, V)