|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r60403 - in trunk: boost/proto boost/proto/detail boost/proto/transform libs/proto/doc
From: eric_at_[hidden]
Date: 2010-03-09 21:03:21
Author: eric_niebler
Date: 2010-03-09 21:03:20 EST (Tue, 09 Mar 2010)
New Revision: 60403
URL: http://svn.boost.org/trac/boost/changeset/60403
Log:
do not use deprecated config macros, thx to daniel james
Text files modified:
trunk/boost/proto/detail/decltype.hpp | 2 +-
trunk/boost/proto/extends.hpp | 6 +++---
trunk/boost/proto/generate.hpp | 2 +-
trunk/boost/proto/matches.hpp | 4 ++--
trunk/boost/proto/traits.hpp | 4 ++--
trunk/boost/proto/transform/arg.hpp | 10 +++++-----
trunk/boost/proto/transform/pass_through.hpp | 2 +-
trunk/libs/proto/doc/acknowledgements.qbk | 3 +++
8 files changed, 18 insertions(+), 15 deletions(-)
Modified: trunk/boost/proto/detail/decltype.hpp
==============================================================================
--- trunk/boost/proto/detail/decltype.hpp (original)
+++ trunk/boost/proto/detail/decltype.hpp 2010-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -35,7 +35,7 @@
#include <boost/utility/enable_if.hpp>
#include <boost/proto/repeat.hpp>
-#ifdef BOOST_HAS_DECLTYPE
+#ifndef BOOST_NO_DECLTYPE
# define BOOST_PROTO_DECLTYPE_(EXPR, TYPE) typedef decltype(EXPR) TYPE;
#else
# define BOOST_PROTO_DECLTYPE_NESTED_TYPEDEF_TPL_(NESTED, EXPR) \
Modified: trunk/boost/proto/extends.hpp
==============================================================================
--- trunk/boost/proto/extends.hpp (original)
+++ trunk/boost/proto/extends.hpp 2010-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -357,7 +357,7 @@
}; \
/**/
- #ifdef BOOST_HAS_VARIADIC_TMPL
+ #ifndef BOOST_NO_VARIADIC_TEMPLATES
#define BOOST_PROTO_EXTENDS_FUNCTION_CONST() \
BOOST_PROTO_EXTENDS_FUNCTION_() \
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(1) \
@@ -473,7 +473,7 @@
// the operator() overloads, which is more efficient.
BOOST_PROTO_EXTENDS_FUNCTION_()
- #ifdef BOOST_HAS_VARIADIC_TMPL
+ #ifndef BOOST_NO_VARIADIC_TEMPLATES
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(1)
#else
/// INTERNAL ONLY
@@ -516,7 +516,7 @@
// the operator() overloads, which is more efficient.
BOOST_PROTO_EXTENDS_FUNCTION_()
- #ifdef BOOST_HAS_VARIADIC_TMPL
+ #ifndef BOOST_NO_VARIADIC_TEMPLATES
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(0)
BOOST_PROTO_DEFINE_FUN_OP_VARIADIC_IMPL_(1)
#else
Modified: trunk/boost/proto/generate.hpp
==============================================================================
--- trunk/boost/proto/generate.hpp (original)
+++ trunk/boost/proto/generate.hpp 2010-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -99,7 +99,7 @@
/// \param expr A Proto expression
/// \return expr
template<typename Expr>
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
Expr
#else
Expr const &
Modified: trunk/boost/proto/matches.hpp
==============================================================================
--- trunk/boost/proto/matches.hpp (original)
+++ trunk/boost/proto/matches.hpp 2010-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -570,7 +570,7 @@
/// \param expr An expression
/// \return \c e
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
result_type
#else
typename impl::expr_param
@@ -609,7 +609,7 @@
/// \param e An expression
/// \pre <tt>matches\<Expr,not_\>::::value</tt> is \c true.
/// \return \c e
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
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-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -542,7 +542,7 @@
/// \pre <tt>matches\<Expr, terminal\<T\> \>::::value</tt> is \c true.
/// \return \c e
/// \throw nothrow
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
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
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
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-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -38,7 +38,7 @@
/// \param e The current expression.
/// \return \c e
/// \throw nothrow
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
result_type
#else
typename impl::expr_param
@@ -75,7 +75,7 @@
/// \param s The current state.
/// \return \c s
/// \throw nothrow
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
result_type
#else
typename impl::state_param
@@ -113,7 +113,7 @@
/// \param d The current data.
/// \return \c d
/// \throw nothrow
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
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
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
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
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
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/pass_through.hpp
==============================================================================
--- trunk/boost/proto/transform/pass_through.hpp (original)
+++ trunk/boost/proto/transform/pass_through.hpp 2010-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -67,7 +67,7 @@
/// \param e An expression
/// \return \c e
/// \throw nothrow
- #ifdef BOOST_HAS_DECLTYPE
+ #ifndef BOOST_NO_DECLTYPE
result_type
#else
typename pass_through_impl::expr_param
Modified: trunk/libs/proto/doc/acknowledgements.qbk
==============================================================================
--- trunk/libs/proto/doc/acknowledgements.qbk (original)
+++ trunk/libs/proto/doc/acknowledgements.qbk 2010-03-09 21:03:20 EST (Tue, 09 Mar 2010)
@@ -12,6 +12,9 @@
little more than a vision. Their requirements and feedback have been
indespensable.
+Thanks to Daniel James for providing a patch to remove the dependence on
+deprecated configuration macros for C++0x features.
+
Thanks also to the developers of _PETE_. I found many good ideas there.
[endsect]
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