|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81494 - in trunk/boost/intrusive: . detail
From: marshall_at_[hidden]
Date: 2012-11-23 10:27:48
Author: marshall
Date: 2012-11-23 10:27:47 EST (Fri, 23 Nov 2012)
New Revision: 81494
URL: http://svn.boost.org/trac/boost/changeset/81494
Log:
Remove usage of deprecated macros
Text files modified:
trunk/boost/intrusive/detail/memory_util.hpp | 8 ++++----
trunk/boost/intrusive/detail/workaround.hpp | 2 +-
trunk/boost/intrusive/pointer_traits.hpp | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
Modified: trunk/boost/intrusive/detail/memory_util.hpp
==============================================================================
--- trunk/boost/intrusive/detail/memory_util.hpp (original)
+++ trunk/boost/intrusive/detail/memory_util.hpp 2012-11-23 10:27:47 EST (Fri, 23 Nov 2012)
@@ -149,7 +149,7 @@
template <typename T> struct first_param
{ typedef void type; };
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <template <typename, typename...> class TemplateClass, typename T, typename... Args>
struct first_param< TemplateClass<T, Args...> >
@@ -173,7 +173,7 @@
#define BOOST_PP_LOCAL_LIMITS (0, BOOST_INTRUSIVE_MAX_CONSTRUCTOR_PARAMETERS)
#include BOOST_PP_LOCAL_ITERATE()
-#endif //!defined(BOOST_NO_VARIADIC_TEMPLATES)
+#endif //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
///////////////////////////
//struct type_rebind_mode
@@ -245,7 +245,7 @@
// OtherArgs>, where OtherArgs comprises zero or more type parameters.
// Many pointers fit this form, hence many pointers will get a
// reasonable default for rebind.
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template <template <class, class...> class Ptr, typename T, class... Tn, class U>
struct type_rebinder<Ptr<T, Tn...>, U, 0u >
@@ -277,7 +277,7 @@
#define BOOST_PP_LOCAL_LIMITS (0, BOOST_INTRUSIVE_MAX_CONSTRUCTOR_PARAMETERS)
#include BOOST_PP_LOCAL_ITERATE()
-#endif //!defined(BOOST_NO_VARIADIC_TEMPLATES)
+#endif //!defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
} //namespace detail {
} //namespace intrusive {
Modified: trunk/boost/intrusive/detail/workaround.hpp
==============================================================================
--- trunk/boost/intrusive/detail/workaround.hpp (original)
+++ trunk/boost/intrusive/detail/workaround.hpp 2012-11-23 10:27:47 EST (Fri, 23 Nov 2012)
@@ -13,7 +13,7 @@
#include <boost/intrusive/detail/config_begin.hpp>
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#define BOOST_INTRUSIVE_PERFECT_FORWARDING
#endif
Modified: trunk/boost/intrusive/pointer_traits.hpp
==============================================================================
--- trunk/boost/intrusive/pointer_traits.hpp (original)
+++ trunk/boost/intrusive/pointer_traits.hpp 2012-11-23 10:27:47 EST (Fri, 23 Nov 2012)
@@ -81,10 +81,10 @@
typedef typename boost::intrusive::detail::type_rebinder<Ptr, U>::type type;
};
- #if !defined(BOOST_NO_TEMPLATE_ALIASES)
+ #if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template <class U> using rebind = typename boost::intrusive::detail::type_rebinder<Ptr, U>::type;
#endif
- #endif //#if !defined(BOOST_NO_TEMPLATE_ALIASES)
+ #endif //#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
//! <b>Remark</b>: If element_type is (possibly cv-qualified) void, r type is unspecified; otherwise,
//! it is element_type &.
@@ -225,7 +225,7 @@
template <class U> using rebind = U*;
#else
typedef typename boost::intrusive::detail::unvoid<element_type>::type& reference;
- #if !defined(BOOST_NO_TEMPLATE_ALIASES)
+ #if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template <class U> using rebind = U*;
#endif
#endif
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