|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r62368 - in trunk/boost/proto: . context detail transform
From: eric_at_[hidden]
Date: 2010-06-01 10:18:45
Author: eric_niebler
Date: 2010-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
New Revision: 62368
URL: http://svn.boost.org/trac/boost/changeset/62368
Log:
use boost::tr1_result_of to avoid problems with boost::result_of and decltype
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/matches.hpp | 4 ++--
trunk/boost/proto/traits.hpp | 4 ++--
trunk/boost/proto/transform/arg.hpp | 10 +++++-----
trunk/boost/proto/transform/call.hpp | 2 +-
trunk/boost/proto/transform/default.hpp | 4 ++--
trunk/boost/proto/transform/pass_through.hpp | 4 ++--
10 files changed, 26 insertions(+), 26 deletions(-)
Modified: trunk/boost/proto/context/callable.hpp
==============================================================================
--- trunk/boost/proto/context/callable.hpp (original)
+++ trunk/boost/proto/context/callable.hpp 2010-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -115,7 +115,7 @@
typedef typename proto::result_of::value<Expr const &>::type value_type;
typedef
- typename boost::result_of<
+ typename boost::tr1_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::result_of<
+ typename boost::tr1_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-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -324,7 +324,7 @@
function_type;
typedef
- typename boost::result_of<function_type()>::type
+ typename boost::tr1_result_of<function_type()>::type
result_type;
result_type operator ()(Expr &expr, Context &context) const
@@ -425,7 +425,7 @@
function_type;
typedef
- typename boost::result_of<
+ typename boost::tr1_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-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -337,7 +337,7 @@
// member object pointers.
template<typename T, typename Void = void>
struct result_of_
- : boost::result_of<T>
+ : boost::tr1_result_of<T>
{};
template<typename T, typename U, typename V>
@@ -489,7 +489,7 @@
{
typedef typename remove_const<typename remove_reference<PMF>::type>::type pmf_type;
typedef typename classtypeof<pmf_type>::type V;
- typedef typename boost::result_of<pmf_type(T)>::type result_type;
+ typedef typename boost::tr1_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-06-01 10:18:42 EDT (Tue, 01 Jun 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::result_of< \
+ typename boost::tr1_result_of< \
proto_domain( \
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::result_of< \
+ typename boost::tr1_result_of< \
proto_domain( \
typename boost::proto::result_of::funop< \
proto_derived_expr Const()(A const &...) \
@@ -200,7 +200,7 @@
#define BOOST_PROTO_EXTENDS_COPY_ASSIGN_IMPL_(This, Const, Typename) \
BOOST_PROTO_DISABLE_MSVC_C4522 \
- Typename() boost::result_of< \
+ Typename() boost::tr1_result_of< \
Typename() This::proto_domain( \
boost::proto::expr< \
boost::proto::tag::assign \
@@ -247,7 +247,7 @@
///
#define BOOST_PROTO_EXTENDS_ASSIGN_IMPL_(ThisConst, ThatConst) \
template<typename A> \
- typename boost::result_of< \
+ typename boost::tr1_result_of< \
proto_domain( \
boost::proto::expr< \
boost::proto::tag::assign \
@@ -311,7 +311,7 @@
///
#define BOOST_PROTO_EXTENDS_SUBSCRIPT_IMPL_(ThisConst, ThatConst) \
template<typename A> \
- typename boost::result_of< \
+ typename boost::tr1_result_of< \
proto_domain( \
boost::proto::expr< \
boost::proto::tag::subscript \
@@ -363,7 +363,7 @@
struct result \
{ \
typedef \
- typename boost::result_of< \
+ typename boost::tr1_result_of< \
proto_domain( \
typename boost::proto::result_of::funop< \
Sig \
Modified: trunk/boost/proto/matches.hpp
==============================================================================
--- trunk/boost/proto/matches.hpp (original)
+++ trunk/boost/proto/matches.hpp 2010-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -560,7 +560,7 @@
/// \param expr An expression
/// \return \c e
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename impl::expr_param
@@ -612,7 +612,7 @@
/// \param e An expression
/// \pre <tt>matches\<Expr,not_\>::::value</tt> is \c true.
/// \return \c e
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename impl::expr_param
Modified: trunk/boost/proto/traits.hpp
==============================================================================
--- trunk/boost/proto/traits.hpp (original)
+++ trunk/boost/proto/traits.hpp 2010-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -542,7 +542,7 @@
/// \pre <tt>matches\<Expr, terminal\<T\> \>::::value</tt> is \c true.
/// \return \c e
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename impl::expr_param
@@ -612,7 +612,7 @@
/// \pre <tt>matches\<Expr, nullary_expr\<Tag, T\> \>::::value</tt> is \c true.
/// \return \c e
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename impl::expr_param
Modified: trunk/boost/proto/transform/arg.hpp
==============================================================================
--- trunk/boost/proto/transform/arg.hpp (original)
+++ trunk/boost/proto/transform/arg.hpp 2010-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -38,7 +38,7 @@
/// \param e The current expression.
/// \return \c e
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename impl::expr_param
@@ -75,7 +75,7 @@
/// \param s The current state.
/// \return \c s
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename impl::state_param
@@ -113,7 +113,7 @@
/// \param d The current data.
/// \return \c d
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename impl::data_param
@@ -154,7 +154,7 @@
/// \param e The current expression.
/// \return <tt>proto::child_c\<N\>(e)</tt>
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename result_of::child_c<typename impl::expr_param, N>::type
@@ -194,7 +194,7 @@
/// \param e The current expression.
/// \return <tt>proto::value(e)</tt>
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
typename mpl::if_c<is_array<result_type>::value, result_type &, result_type>::type
#else
typename result_of::value<typename impl::expr_param>::type
Modified: trunk/boost/proto/transform/call.hpp
==============================================================================
--- trunk/boost/proto/transform/call.hpp (original)
+++ trunk/boost/proto/transform/call.hpp 2010-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -91,7 +91,7 @@
struct impl2
: transform_impl<Expr, State, Data>
{
- typedef typename boost::result_of<Fun()>::type result_type;
+ typedef typename boost::tr1_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-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -482,7 +482,7 @@
function_type;
typedef
- typename boost::result_of<function_type()>::type
+ typename boost::tr1_result_of<function_type()>::type
result_type;
result_type operator ()(
@@ -615,7 +615,7 @@
function_type;
typedef
- typename boost::result_of<
+ typename boost::tr1_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-06-01 10:18:42 EDT (Tue, 01 Jun 2010)
@@ -69,7 +69,7 @@
/// \param e An expression
/// \return \c e
/// \throw nothrow
- #ifndef BOOST_NO_DECLTYPE
+ #ifdef BOOST_PROTO_STRICT_RESULT_OF
result_type
#else
typename pass_through_impl::expr_param
@@ -176,7 +176,7 @@
> expr_type;
typedef typename unref_expr::proto_domain proto_domain;
- typedef typename boost::result_of<proto_domain(expr_type)>::type result_type;
+ typedef typename boost::tr1_result_of<proto_domain(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