|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r83248 - in sandbox/type_erasure: boost/type_erasure boost/type_erasure/detail libs/type_erasure/test
From: steven_at_[hidden]
Date: 2013-03-02 13:15:08
Author: steven_watanabe
Date: 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
New Revision: 83248
URL: http://svn.boost.org/trac/boost/changeset/83248
Log:
Replace deprecated macros.
Text files modified:
sandbox/type_erasure/boost/type_erasure/any.hpp | 4 ++--
sandbox/type_erasure/boost/type_erasure/call.hpp | 8 ++++----
sandbox/type_erasure/boost/type_erasure/callable.hpp | 4 ++--
sandbox/type_erasure/boost/type_erasure/check_match.hpp | 4 ++--
sandbox/type_erasure/boost/type_erasure/constructible.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/detail/adapt_to_vtable.hpp | 4 ++--
sandbox/type_erasure/boost/type_erasure/detail/check_call.hpp | 6 +++---
sandbox/type_erasure/boost/type_erasure/detail/extract_concept.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/detail/get_placeholders.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/detail/rebind_placeholders.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/detail/storage.hpp | 4 ++--
sandbox/type_erasure/boost/type_erasure/detail/vtable.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/free.hpp | 2 +-
sandbox/type_erasure/boost/type_erasure/member.hpp | 4 ++--
sandbox/type_erasure/boost/type_erasure/param.hpp | 6 +++---
sandbox/type_erasure/boost/type_erasure/require_match.hpp | 4 ++--
sandbox/type_erasure/boost/type_erasure/tuple.hpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_callable.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_member.cpp | 2 +-
sandbox/type_erasure/libs/type_erasure/test/test_param.cpp | 2 +-
20 files changed, 34 insertions(+), 34 deletions(-)
Modified: sandbox/type_erasure/boost/type_erasure/any.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/any.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/any.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -548,7 +548,7 @@
)
{}
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<class R, class... A, class... U>
const table_type& _boost_type_erasure_extract_table(
@@ -1466,7 +1466,7 @@
table_type table;
};
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class Concept, class T>
class any<Concept, T&&> :
Modified: sandbox/type_erasure/boost/type_erasure/call.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/call.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/call.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -126,7 +126,7 @@
return ::boost::type_erasure::detail::access::data(arg);
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class T>
T&& convert_arg(T&& arg, boost::mpl::false_) { return std::forward<T>(arg); }
@@ -216,7 +216,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)
namespace detail {
@@ -391,7 +391,7 @@
#define N BOOST_PP_ITERATION()
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
#define BOOST_TYPE_ERASURE_CONVERT_ARG(z, n, data) \
::boost::type_erasure::detail::convert_arg( \
@@ -526,7 +526,7 @@
}
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
#define RREF &
#define BOOST_TYPE_ERASURE_FORWARD_ARGS(N, X, x) BOOST_PP_ENUM_TRAILING_PARAMS(N, x)
#else
Modified: sandbox/type_erasure/boost/type_erasure/callable.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/callable.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/callable.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -67,7 +67,7 @@
static R apply(F& f, T... arg);
};
-#elif !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#elif !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template<class R, class... T, class F>
struct callable<R(T...), F>
@@ -224,7 +224,7 @@
#define BOOST_TYPE_ERASURE_REBIND(z, n, data)\
typename ::boost::type_erasure::as_param<Base, BOOST_PP_CAT(T, n)>::type BOOST_PP_CAT(arg, n)
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
#define BOOST_TYPE_ERASURE_FORWARD(z, n, data) BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 1, data), n)
#define BOOST_TYPE_ERASURE_FORWARD_REBIND(z, n, data) BOOST_PP_CAT(arg, n)
#else
Modified: sandbox/type_erasure/boost/type_erasure/check_match.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/check_match.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/check_match.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -90,7 +90,7 @@
#else
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
namespace detail {
@@ -219,7 +219,7 @@
}
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
#define RREF &
#else
#define RREF &&
Modified: sandbox/type_erasure/boost/type_erasure/constructible.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/constructible.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/constructible.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -60,7 +60,7 @@
template<class Sig>
struct constructible {};
-#elif !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#elif !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<class R, class... T>
struct constructible<R(T...)>
Modified: sandbox/type_erasure/boost/type_erasure/detail/adapt_to_vtable.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/adapt_to_vtable.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/adapt_to_vtable.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -146,7 +146,7 @@
>::type type;
};
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<class PrimitiveConcept, class Sig, class ConceptSig>
struct vtable_adapter_impl;
@@ -214,7 +214,7 @@
#define N BOOST_PP_ITERATION()
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
#define BOOST_TYPE_ERASURE_EXTRACT(z, n, data) \
::boost::type_erasure::detail::extract< \
Modified: sandbox/type_erasure/boost/type_erasure/detail/check_call.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/check_call.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/check_call.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -57,7 +57,7 @@
>::type& type;
};
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class T>
struct qualified_placeholder<T&&, typename T::_boost_type_erasure_is_any>
@@ -81,7 +81,7 @@
template<class P>
struct check_placeholder_arg_impl<P, const P&> : ::boost::mpl::true_ {};
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class P>
struct check_placeholder_arg_impl<P, P&&> : ::boost::mpl::true_ {};
@@ -97,7 +97,7 @@
template<class P>
struct check_placeholder_arg_impl<const P&, const P&> : ::boost::mpl::true_ {};
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class P>
struct check_placeholder_arg_impl<const P&, P&&> : ::boost::mpl::true_ {};
Modified: sandbox/type_erasure/boost/type_erasure/detail/extract_concept.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/extract_concept.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/extract_concept.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -56,7 +56,7 @@
>::type type;
};
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<class Args, class... U>
struct extract_concept;
Modified: sandbox/type_erasure/boost/type_erasure/detail/get_placeholders.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/get_placeholders.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/get_placeholders.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -59,7 +59,7 @@
>::type type;
};
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<class Out, class... T>
struct get_placeholders_impl;
Modified: sandbox/type_erasure/boost/type_erasure/detail/rebind_placeholders.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/rebind_placeholders.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/rebind_placeholders.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -103,7 +103,7 @@
>::type type;
};
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<template<class...> class T, class... U, class Bindings>
struct rebind_placeholders<T<U...>, Bindings>
Modified: sandbox/type_erasure/boost/type_erasure/detail/storage.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/storage.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/storage.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -26,7 +26,7 @@
};
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class T>
T extract(T arg) { return std::forward<T>(arg); }
@@ -50,7 +50,7 @@
return *static_cast<const typename ::boost::remove_reference<T>::type*>(arg.data);
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class T>
T extract(storage&& arg)
Modified: sandbox/type_erasure/boost/type_erasure/detail/vtable.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/detail/vtable.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/detail/vtable.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -30,7 +30,7 @@
namespace type_erasure {
namespace detail {
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CONSTEXPR) && !defined(BOOST_NO_DEFAULTED_FUNCTIONS)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CONSTEXPR) && !defined(BOOST_NO_DEFAULTED_FUNCTIONS)
template<class... T>
struct stored_arg_pack;
Modified: sandbox/type_erasure/boost/type_erasure/free.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/free.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/free.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -33,7 +33,7 @@
#include <boost/type_erasure/call.hpp>
#include <boost/type_erasure/concept_interface.hpp>
-#if defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_TYPE_ERASURE_DOXYGEN)
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_TYPE_ERASURE_DOXYGEN)
namespace boost {
namespace type_erasure {
Modified: sandbox/type_erasure/boost/type_erasure/member.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/member.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/member.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -33,7 +33,7 @@
#define BOOST_TYPE_ERASURE_MEMBER_ARG(z, n, data) \
typename ::boost::type_erasure::as_param<Base, BOOST_PP_CAT(A, n)>::type BOOST_PP_CAT(a, n)
-#if defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_TYPE_ERASURE_DOXYGEN)
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_TYPE_ERASURE_DOXYGEN)
/** INTERNAL ONLY */
#define BOOST_TYPE_ERASURE_MEMBER_QUALIFIED_ID(seq, N) \
@@ -44,7 +44,7 @@
/** INTERNAL ONLY */
#define BOOST_TYPE_ERASURE_MEMBER_ENUM_PARAMS(N, X) BOOST_PP_ENUM_PARAMS(N, X)
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
/** INTERNAL ONLY */
#define BOOST_TYPE_ERASURE_MEMBER_FORWARD(z, n, data) ::std::forward<BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 0, data), n)>(BOOST_PP_CAT(BOOST_PP_TUPLE_ELEM(2, 1, data), n))
Modified: sandbox/type_erasure/boost/type_erasure/param.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/param.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/param.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -64,7 +64,7 @@
template<class T>
struct placeholder_conversion<const T&, const T&> : boost::mpl::true_ {};
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class T>
struct placeholder_conversion<T&&, T> : boost::mpl::true_ {};
template<class T>
@@ -156,7 +156,7 @@
)
: _impl(a)
{}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class U>
param(any<Concept, U>&& a
#ifndef BOOST_TYPE_ERASURE_DOXYGEN
@@ -225,7 +225,7 @@
}
};
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
template<class Concept, class T>
class param<Concept, T&&> : public param<Concept, const T&> {
Modified: sandbox/type_erasure/boost/type_erasure/require_match.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/require_match.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/require_match.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -60,7 +60,7 @@
#else
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
namespace detail {
@@ -146,7 +146,7 @@
#define N BOOST_PP_ITERATION()
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
#define RREF &
#define BOOST_TYPE_ERASURE_FORWARD_ARGS(N, X, x) BOOST_PP_ENUM_TRAILING_PARAMS(N, x)
#else
Modified: sandbox/type_erasure/boost/type_erasure/tuple.hpp
==============================================================================
--- sandbox/type_erasure/boost/type_erasure/tuple.hpp (original)
+++ sandbox/type_erasure/boost/type_erasure/tuple.hpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -54,7 +54,7 @@
}
}
-#elif !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_RVALUE_REFERENCES)
+#elif !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
#include <boost/mpl/int.hpp>
#include <boost/mpl/bool.hpp>
Modified: sandbox/type_erasure/libs/type_erasure/test/test_callable.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_callable.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_callable.cpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -376,7 +376,7 @@
BOOST_MPL_ASSERT((boost::is_same<boost::result_of<const any<test_concept>(any<test_concept, _a>)>::type, int>));
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
int f_rv_value = 0;
void f_rv(int&& i) { f_rv_value += i; }
Modified: sandbox/type_erasure/libs/type_erasure/test/test_member.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_member.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_member.cpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -98,7 +98,7 @@
BOOST_CHECK_EQUAL(x.f1(5), 15);
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
BOOST_AUTO_TEST_CASE(test_global_has_f1_rv) {
typedef ::boost::mpl::vector<
Modified: sandbox/type_erasure/libs/type_erasure/test/test_param.cpp
==============================================================================
--- sandbox/type_erasure/libs/type_erasure/test/test_param.cpp (original)
+++ sandbox/type_erasure/libs/type_erasure/test/test_param.cpp 2013-03-02 13:15:06 EST (Sat, 02 Mar 2013)
@@ -146,7 +146,7 @@
param<copy_constructible<>, _self> c12 = a12();
}
-#ifndef BOOST_NO_RVALUE_REFERENCES
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
size<1>::type f4(param<copy_constructible<>, _self&&>);
size<2>::type f4(...);
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