|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r67285 - in trunk/boost/proto: . context detail transform
From: eric_at_[hidden]
Date: 2010-12-17 13:31:55
Author: eric_niebler
Date: 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
New Revision: 67285
URL: http://svn.boost.org/trac/boost/changeset/67285
Log:
maintenance tweak: use PP to control use of tr1_result_of
Text files modified:
trunk/boost/proto/context/callable.hpp | 4 ++--
trunk/boost/proto/context/default.hpp | 4 ++--
trunk/boost/proto/detail/decltype.hpp | 4 ++--
trunk/boost/proto/extends.hpp | 12 ++++++------
trunk/boost/proto/proto_fwd.hpp | 12 +++++++++---
trunk/boost/proto/transform/call.hpp | 2 +-
trunk/boost/proto/transform/default.hpp | 4 ++--
trunk/boost/proto/transform/pass_through.hpp | 2 +-
8 files changed, 25 insertions(+), 19 deletions(-)
Modified: trunk/boost/proto/context/callable.hpp
==============================================================================
--- trunk/boost/proto/context/callable.hpp (original)
+++ trunk/boost/proto/context/callable.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -115,7 +115,7 @@
typedef typename proto::result_of::value<Expr const &>::type value_type;
typedef
- typename boost::tr1_result_of<
+ typename BOOST_PROTO_RESULT_OF<
Context(typename Expr::proto_tag, value_type)
>::type
result_type;
@@ -294,7 +294,7 @@
BOOST_PP_REPEAT(N, BOOST_PROTO_CHILD_N_TYPE, Expr)
typedef
- typename boost::tr1_result_of<
+ typename BOOST_PROTO_RESULT_OF<
Context(
typename Expr::proto_tag
BOOST_PP_ENUM_TRAILING_PARAMS(N, child)
Modified: trunk/boost/proto/context/default.hpp
==============================================================================
--- trunk/boost/proto/context/default.hpp (original)
+++ trunk/boost/proto/context/default.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -322,7 +322,7 @@
function_type;
typedef
- typename boost::tr1_result_of<function_type()>::type
+ typename BOOST_PROTO_RESULT_OF<function_type()>::type
result_type;
result_type operator ()(Expr &expr, Context &context) const
@@ -423,7 +423,7 @@
function_type;
typedef
- typename boost::tr1_result_of<
+ typename BOOST_PROTO_RESULT_OF<
function_type(BOOST_PP_ENUM_SHIFTED(N, BOOST_PROTO_DEFAULT_EVAL_TYPE, Expr))
>::type
result_type;
Modified: trunk/boost/proto/detail/decltype.hpp
==============================================================================
--- trunk/boost/proto/detail/decltype.hpp (original)
+++ trunk/boost/proto/detail/decltype.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -336,7 +336,7 @@
// member object pointers.
template<typename T, typename Void = void>
struct result_of_
- : boost::tr1_result_of<T>
+ : BOOST_PROTO_RESULT_OF<T>
{};
template<typename T, typename U, typename V>
@@ -486,7 +486,7 @@
{
typedef typename uncvref<PMF>::type pmf_type;
typedef typename classtypeof<pmf_type>::type V;
- typedef typename boost::tr1_result_of<pmf_type(T)>::type result_type;
+ typedef typename BOOST_PROTO_RESULT_OF<pmf_type(T)>::type result_type;
memfun(T t, PMF p)
: obj(t)
Modified: trunk/boost/proto/extends.hpp
==============================================================================
--- trunk/boost/proto/extends.hpp (original)
+++ trunk/boost/proto/extends.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -74,7 +74,7 @@
///
#define BOOST_PROTO_DEFINE_FUN_OP_IMPL_(Z, N, DATA, Const) \
BOOST_PP_IF(N, BOOST_PROTO_TEMPLATE_YES_, BOOST_PROTO_TEMPLATE_NO_)(Z, N) \
- typename boost::tr1_result_of< \
+ typename BOOST_PROTO_RESULT_OF< \
proto_generator( \
typename boost::proto::result_of::BOOST_PP_CAT(funop, N)< \
proto_derived_expr Const() \
@@ -103,7 +103,7 @@
///
#define BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(Const) \
template<typename... A> \
- typename boost::tr1_result_of< \
+ typename BOOST_PROTO_RESULT_OF< \
proto_generator( \
typename boost::proto::result_of::funop< \
proto_derived_expr Const()(A const &...) \
@@ -202,7 +202,7 @@
#define BOOST_PROTO_EXTENDS_COPY_ASSIGN_IMPL_(This, Const, Typename) \
BOOST_PROTO_DISABLE_MSVC_C4522 \
- Typename() boost::tr1_result_of< \
+ Typename() BOOST_PROTO_RESULT_OF< \
Typename() This::proto_generator( \
Typename() boost::proto::base_expr< \
Typename() This::proto_domain \
@@ -251,7 +251,7 @@
///
#define BOOST_PROTO_EXTENDS_ASSIGN_IMPL_(ThisConst, ThatConst) \
template<typename A> \
- typename boost::tr1_result_of< \
+ typename BOOST_PROTO_RESULT_OF< \
proto_generator( \
typename boost::proto::base_expr< \
proto_domain \
@@ -317,7 +317,7 @@
///
#define BOOST_PROTO_EXTENDS_SUBSCRIPT_IMPL_(ThisConst, ThatConst) \
template<typename A> \
- typename boost::tr1_result_of< \
+ typename BOOST_PROTO_RESULT_OF< \
proto_generator( \
typename boost::proto::base_expr< \
proto_domain \
@@ -371,7 +371,7 @@
struct result \
{ \
typedef \
- typename boost::tr1_result_of< \
+ typename BOOST_PROTO_RESULT_OF< \
proto_generator( \
typename boost::proto::result_of::funop< \
Sig \
Modified: trunk/boost/proto/proto_fwd.hpp
==============================================================================
--- trunk/boost/proto/proto_fwd.hpp (original)
+++ trunk/boost/proto/proto_fwd.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -83,6 +83,12 @@
# endif
#endif
+#ifdef BOOST_PROTO_USE_NORMAL_RESULT_OF
+# define BOOST_PROTO_RESULT_OF boost::result_of
+#else
+# define BOOST_PROTO_RESULT_OF boost::tr1_result_of
+#endif
+
namespace boost { namespace proto
{
namespace detail
@@ -154,8 +160,8 @@
/// INTERNAL ONLY
///
#define BOOST_PROTO_UNCVREF(X) \
- typename boost::proto::detail::uncvref<X>::type \
- /**/
+ typename boost::proto::detail::uncvref<X>::type \
+ /**/
struct _default;
@@ -744,7 +750,7 @@
//namespace exops
//{}
- namespace exops = exprns_;
+ namespace exops = exprns_;
}} // namespace boost::proto
Modified: trunk/boost/proto/transform/call.hpp
==============================================================================
--- trunk/boost/proto/transform/call.hpp (original)
+++ trunk/boost/proto/transform/call.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -91,7 +91,7 @@
struct impl2
: transform_impl<Expr, State, Data>
{
- typedef typename boost::tr1_result_of<Fun()>::type result_type;
+ typedef typename BOOST_PROTO_RESULT_OF<Fun()>::type result_type;
result_type operator()(
typename impl2::expr_param
Modified: trunk/boost/proto/transform/default.hpp
==============================================================================
--- trunk/boost/proto/transform/default.hpp (original)
+++ trunk/boost/proto/transform/default.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -480,7 +480,7 @@
function_type;
typedef
- typename boost::tr1_result_of<function_type()>::type
+ typename BOOST_PROTO_RESULT_OF<function_type()>::type
result_type;
result_type operator ()(
@@ -613,7 +613,7 @@
function_type;
typedef
- typename boost::tr1_result_of<
+ typename BOOST_PROTO_RESULT_OF<
function_type(BOOST_PP_ENUM_SHIFTED_PARAMS(N, r))
>::type
result_type;
Modified: trunk/boost/proto/transform/pass_through.hpp
==============================================================================
--- trunk/boost/proto/transform/pass_through.hpp (original)
+++ trunk/boost/proto/transform/pass_through.hpp 2010-12-17 13:31:47 EST (Fri, 17 Dec 2010)
@@ -178,7 +178,7 @@
expr_type;
typedef typename unref_expr::proto_generator proto_generator;
- typedef typename boost::tr1_result_of<proto_generator(expr_type)>::type result_type;
+ typedef typename BOOST_PROTO_RESULT_OF<proto_generator(expr_type)>::type result_type;
result_type const operator ()(
typename pass_through_impl::expr_param e
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