Subject: [Boost-commit] svn:boost r81468 - in trunk/boost/proto: . detail transform
From: marshall_at_[hidden]
Date: 2012-11-21 16:38:53
Author: marshall
Date: 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
New Revision: 81468
URL: http://svn.boost.org/trac/boost/changeset/81468
Log:
Remove usage of deprecated macros
Text files modified:
trunk/boost/proto/detail/decltype.hpp | 2 +-
trunk/boost/proto/detail/deduce_domain.hpp | 8 ++++----
trunk/boost/proto/detail/expr.hpp | 10 +++++-----
trunk/boost/proto/detail/extends_funop.hpp | 2 +-
trunk/boost/proto/detail/extends_funop_const.hpp | 2 +-
trunk/boost/proto/extends.hpp | 2 +-
trunk/boost/proto/operators.hpp | 4 ++--
trunk/boost/proto/proto_fwd.hpp | 2 +-
trunk/boost/proto/transform/impl.hpp | 2 +-
9 files changed, 17 insertions(+), 17 deletions(-)
Modified: trunk/boost/proto/detail/decltype.hpp
==============================================================================
--- trunk/boost/proto/detail/decltype.hpp (original)
+++ trunk/boost/proto/detail/decltype.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -43,7 +43,7 @@
// We're STILL using Boost.Typeof on MSVC even for msvc-11.0 because of this bug:
// https://connect.microsoft.com/VisualStudio/feedback/details/765392/decltype-of-a-pointer-to-member-operator-gets-ref-qualification-wrong
-#if !defined(BOOST_NO_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1700))
+#if !defined(BOOST_NO_CXX11_DECLTYPE) && !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1700))
# define BOOST_PROTO_DECLTYPE_(EXPR, TYPE) typedef decltype((EXPR)) TYPE;
#else
# define BOOST_PROTO_DECLTYPE_NESTED_TYPEDEF_TPL_(NESTED, EXPR) \
Modified: trunk/boost/proto/detail/deduce_domain.hpp
==============================================================================
--- trunk/boost/proto/detail/deduce_domain.hpp (original)
+++ trunk/boost/proto/detail/deduce_domain.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -44,7 +44,7 @@
{
typedef Domain type;
typedef domain_<typename Domain::proto_super_domain> base;
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
using base::deduce98;
static int const index = base::index + 1;
static typename sized_type<index>::type deduce98(domain_<Domain>*);
@@ -58,7 +58,7 @@
struct domain_<not_a_domain>
{
typedef not_a_domain type;
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
static int const index = 1;
static sized_type<1>::type deduce98(void*);
#else
@@ -86,7 +86,7 @@
sized_type<4>::type default_test(domain_<default_domain>*, domain_<basic_default_domain>*);
sized_type<4>::type default_test(domain_<basic_default_domain>*, domain_<basic_default_domain>*);
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
template<int N, typename Domain>
struct nth_domain
: nth_domain<N - 1, typename Domain::base>
@@ -116,7 +116,7 @@
>
struct common_domain2
{
- #ifdef BOOST_NO_DECLTYPE
+ #ifdef BOOST_NO_CXX11_DECLTYPE
static int const index = domain_<D0>::index - sizeof(domain_<D0>::deduce98((domain_<D1>*)0));
typedef typename nth_domain<index, domain_<D0> >::type type;
#else
Modified: trunk/boost/proto/detail/expr.hpp
==============================================================================
--- trunk/boost/proto/detail/expr.hpp (original)
+++ trunk/boost/proto/detail/expr.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -1,6 +1,6 @@
#if !defined(BOOST_PROTO_DONT_USE_PREPROCESSED_FILES)
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#include <boost/proto/detail/preprocessed/expr_variadic.hpp>
#else
#include <boost/proto/detail/preprocessed/expr.hpp>
@@ -51,7 +51,7 @@
// Generate non-variadic versions of expr
#if defined(__WAVE__) && defined(BOOST_PROTO_CREATE_PREPROCESSED_FILES)
- #define BOOST_NO_VARIADIC_TEMPLATES
+ #define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#pragma wave option(preserve: 2, line: 0, output: "preprocessed/expr.hpp")
///////////////////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@
#include BOOST_PP_ITERATE()
#pragma wave option(output: null)
- #undef BOOST_NO_VARIADIC_TEMPLATES
+ #undef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif
#undef BOOST_PROTO_CHILD
@@ -398,7 +398,7 @@
typedef typename result_of::funop<Sig, expr, default_domain>::type const type;
};
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
/// \overload
///
template<typename ...A>
@@ -437,7 +437,7 @@
}
#endif
- #else // BOOST_NO_VARIADIC_TEMPLATES
+ #else // BOOST_NO_CXX11_VARIADIC_TEMPLATES
/// Function call
///
Modified: trunk/boost/proto/detail/extends_funop.hpp
==============================================================================
--- trunk/boost/proto/detail/extends_funop.hpp (original)
+++ trunk/boost/proto/detail/extends_funop.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -1,6 +1,6 @@
#if !defined(BOOST_PROTO_DONT_USE_PREPROCESSED_FILES)
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
BOOST_PROTO_EXTENDS_FUNCTION_()
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(BOOST_PP_EMPTY)
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(BOOST_PROTO_CONST)
Modified: trunk/boost/proto/detail/extends_funop_const.hpp
==============================================================================
--- trunk/boost/proto/detail/extends_funop_const.hpp (original)
+++ trunk/boost/proto/detail/extends_funop_const.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -1,6 +1,6 @@
#if !defined(BOOST_PROTO_DONT_USE_PREPROCESSED_FILES)
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
BOOST_PROTO_EXTENDS_FUNCTION_()
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(BOOST_PROTO_CONST)
#else
Modified: trunk/boost/proto/extends.hpp
==============================================================================
--- trunk/boost/proto/extends.hpp (original)
+++ trunk/boost/proto/extends.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -393,7 +393,7 @@
}; \
/**/
- #ifndef BOOST_NO_VARIADIC_TEMPLATES
+ #ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
#define BOOST_PROTO_EXTENDS_FUNCTION_CONST() \
BOOST_PROTO_EXTENDS_FUNCTION_() \
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(BOOST_PROTO_CONST) \
Modified: trunk/boost/proto/operators.hpp
==============================================================================
--- trunk/boost/proto/operators.hpp (original)
+++ trunk/boost/proto/operators.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -101,7 +101,7 @@
#define BOOST_PROTO_UNARY_OP_IS_POSTFIX_0
#define BOOST_PROTO_UNARY_OP_IS_POSTFIX_1 , int
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
#define BOOST_PROTO_DEFINE_UNARY_OPERATOR(OP, TAG, TRAIT, DOMAIN, POST) \
template<typename Arg> \
@@ -325,7 +325,7 @@
// can use BOOST_PROTO_DEFINE_OPERATORS to define Proto operator overloads that work
// with their own terminal types.
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
#define BOOST_PROTO_APPLY_UNARY_(TRAIT, ARG) \
boost::mpl::and_< \
Modified: trunk/boost/proto/proto_fwd.hpp
==============================================================================
--- trunk/boost/proto/proto_fwd.hpp (original)
+++ trunk/boost/proto/proto_fwd.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -93,7 +93,7 @@
# endif
#endif
-#ifdef BOOST_NO_DECLTYPE_N3276
+#ifdef BOOST_NO_CXX11_DECLTYPE_N3276
# // Proto can only use the decltype-based result_of if N3276 has been
# // implemented by the compiler.
# // See http://www.open-std.org/JTC1/SC22/WG21/docs/papers/2011/n3276.pdf
Modified: trunk/boost/proto/transform/impl.hpp
==============================================================================
--- trunk/boost/proto/transform/impl.hpp (original)
+++ trunk/boost/proto/transform/impl.hpp 2012-11-21 16:38:52 EST (Wed, 21 Nov 2012)
@@ -75,7 +75,7 @@
: is_env<T>
{};
-#ifdef BOOST_NO_RVALUE_REFERENCES
+#ifdef BOOST_NO_CXX11_RVALUE_REFERENCES
/// INTERNAL ONLY
///