Boost-Commit :

Date view	Thread view	Subject view	Author view

From: eric_at_[hidden]
Date: 2007-11-30 21:42:47

Author: eric_niebler
Date: 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
New Revision: 41525
URL: http://svn.boost.org/trac/boost/changeset/41525

Log:
more renames
Text files modified:
   branches/proto/v3/boost/xpressive/basic_regex.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/detail/static/compile.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/detail/static/grammar.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/detail/static/modifier.hpp | 2 +-
   branches/proto/v3/boost/xpressive/detail/static/width_of.hpp | 2 +-
   branches/proto/v3/boost/xpressive/proto/args.hpp | 6 +++---
   branches/proto/v3/boost/xpressive/proto/context.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/proto/context/callable.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/proto/context/default.hpp | 12 ++++++------
   branches/proto/v3/boost/xpressive/proto/context/null.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/proto/debug.hpp | 12 ++++++------
   branches/proto/v3/boost/xpressive/proto/deep_copy.hpp | 16 ++++++++--------
   branches/proto/v3/boost/xpressive/proto/detail/dont_care.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/proto/domain.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/eval.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/proto/expr.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/proto/extends.hpp | 16 ++++++++--------
   branches/proto/v3/boost/xpressive/proto/fusion.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/generate.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/proto/literal.hpp | 12 ++++++------
   branches/proto/v3/boost/xpressive/proto/make_expr.hpp | 12 ++++++------
   branches/proto/v3/boost/xpressive/proto/matches.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/operators.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/proto.hpp | 38 +++++++++++++++++++-------------------
   branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/proto/proto_typeof.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/tags.hpp | 6 +++---
   branches/proto/v3/boost/xpressive/proto/traits.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/transform.hpp | 16 ++++++++--------
   branches/proto/v3/boost/xpressive/proto/transform/apply.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/transform/arg.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/transform/bind.hpp | 8 ++++----
   branches/proto/v3/boost/xpressive/proto/transform/fold.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/proto/transform/when.hpp | 10 +++++-----
   branches/proto/v3/boost/xpressive/regex_primitives.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/xpressive_fwd.hpp | 4 ++--
   branches/proto/v3/boost/xpressive/xpressive_typeof.hpp | 2 +-
   branches/proto/v3/libs/xpressive/proto/example/calc1.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/example/calc2.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/example/calc3.cpp | 6 +++---
   branches/proto/v3/libs/xpressive/proto/example/hello.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/example/lazy_vector.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/example/mixed.cpp | 6 +++---
   branches/proto/v3/libs/xpressive/proto/example/rgb.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/example/tarray.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/example/vec3.cpp | 8 ++++----
   branches/proto/v3/libs/xpressive/proto/example/vector.cpp | 6 +++---
   branches/proto/v3/libs/xpressive/proto/test/calculator.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/test/examples.cpp | 10 +++++-----
   branches/proto/v3/libs/xpressive/proto/test/lambda.cpp | 6 +++---
   branches/proto/v3/libs/xpressive/proto/test/main.cpp | 6 +++---
   branches/proto/v3/libs/xpressive/proto/test/make_expr.cpp | 2 +-
   branches/proto/v3/libs/xpressive/proto/test/matches.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/test/proto_fusion.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/test/proto_fusion_s.cpp | 4 ++--
   branches/proto/v3/libs/xpressive/proto/test/toy_spirit.cpp | 4 ++--
   57 files changed, 215 insertions(+), 215 deletions(-)

Modified: branches/proto/v3/boost/xpressive/basic_regex.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/basic_regex.hpp (original)
+++ branches/proto/v3/boost/xpressive/basic_regex.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -23,8 +23,8 @@

// Doxygen can't handle proto :-(
#ifndef BOOST_XPRESSIVE_DOXYGEN_INVOKED
-# include <boost/xpressive/detail/static/grammar2.hpp>
-# include <boost/xpressive/proto3/extends.hpp>
+# include <boost/xpressive/detail/static/grammar.hpp>
+# include <boost/xpressive/proto/extends.hpp>
#endif

#if BOOST_XPRESSIVE_HAS_MS_STACK_GUARD

Modified: branches/proto/v3/boost/xpressive/detail/static/compile.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/compile.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/static/compile.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -15,7 +15,7 @@

#include <boost/mpl/bool.hpp>
#include <boost/iterator/iterator_traits.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
+#include <boost/xpressive/proto/proto.hpp>
#include <boost/xpressive/regex_traits.hpp>
#include <boost/xpressive/detail/core/regex_impl.hpp>
#include <boost/xpressive/detail/core/linker.hpp>
@@ -24,7 +24,7 @@
#include <boost/xpressive/detail/core/matcher/end_matcher.hpp>
#include <boost/xpressive/detail/static/static.hpp>
#include <boost/xpressive/detail/static/visitor.hpp>
-#include <boost/xpressive/detail/static/grammar2.hpp>
+#include <boost/xpressive/detail/static/grammar.hpp>

namespace boost { namespace xpressive { namespace detail
{

Modified: branches/proto/v3/boost/xpressive/detail/static/grammar.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/grammar.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/static/grammar.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -20,8 +20,8 @@
#include <boost/mpl/apply_wrap.hpp>
#include <boost/mpl/next_prior.hpp>
#include <boost/fusion/include/cons.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/transform.hpp>
#include <boost/xpressive/detail/detail_fwd.hpp>
#include <boost/xpressive/detail/static/static.hpp>
#include <boost/xpressive/detail/static/is_pure.hpp>

Modified: branches/proto/v3/boost/xpressive/detail/static/modifier.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/modifier.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/static/modifier.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -17,7 +17,7 @@
#endif

#include <boost/xpressive/detail/detail_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/traits.hpp>
#include <boost/xpressive/regex_constants.hpp>

namespace boost { namespace xpressive { namespace detail

Modified: branches/proto/v3/boost/xpressive/detail/static/width_of.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/detail/static/width_of.hpp (original)
+++ branches/proto/v3/boost/xpressive/detail/static/width_of.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -23,7 +23,7 @@
#include <boost/mpl/equal_to.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/xpressive/detail/detail_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/traits.hpp>

namespace boost { namespace xpressive { namespace detail
{

Modified: branches/proto/v3/boost/xpressive/proto/args.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/args.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/args.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,13 +6,13 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_ARGS_HPP_EAN_10_28_2007
-#define BOOST_PROTO3_ARGS_HPP_EAN_10_28_2007
+#ifndef BOOST_PROTO_ARGS_HPP_EAN_10_28_2007
+#define BOOST_PROTO_ARGS_HPP_EAN_10_28_2007

#include <utility>
#include <boost/type_traits.hpp>
#include <boost/utility/result_of.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>

#define UNCV(X) \
typename remove_cv<X>::type

Modified: branches/proto/v3/boost/xpressive/proto/context.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/context.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/context.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,11 +6,11 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_CONTEXT_HPP_EAN_06_23_2007
-#define BOOST_PROTO3_CONTEXT_HPP_EAN_06_23_2007
+#ifndef BOOST_PROTO_CONTEXT_HPP_EAN_06_23_2007
+#define BOOST_PROTO_CONTEXT_HPP_EAN_06_23_2007

-#include <boost/xpressive/proto3/context/null.hpp>
-#include <boost/xpressive/proto3/context/default.hpp>
-#include <boost/xpressive/proto3/context/callable.hpp>
+#include <boost/xpressive/proto/context/null.hpp>
+#include <boost/xpressive/proto/context/default.hpp>
+#include <boost/xpressive/proto/context/callable.hpp>

#endif

Modified: branches/proto/v3/boost/xpressive/proto/context/callable.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/context/callable.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/context/callable.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -9,8 +9,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_CONTEXT_CALLABLE_HPP_EAN_06_23_2007
-#define BOOST_PROTO3_CONTEXT_CALLABLE_HPP_EAN_06_23_2007
+#ifndef BOOST_PROTO_CONTEXT_CALLABLE_HPP_EAN_06_23_2007
+#define BOOST_PROTO_CONTEXT_CALLABLE_HPP_EAN_06_23_2007

#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
@@ -18,9 +18,9 @@
#include <boost/mpl/bool.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/type_traits.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp> // for arg_c
-#include <boost/xpressive/proto3/detail/dont_care.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp> // for arg_c
+#include <boost/xpressive/proto/detail/dont_care.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/context/default.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/context/default.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/context/default.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -8,8 +8,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_CONTEXT_DEFAULT_HPP_EAN_01_08_2007
-#define BOOST_PROTO3_CONTEXT_DEFAULT_HPP_EAN_01_08_2007
+#ifndef BOOST_PROTO_CONTEXT_DEFAULT_HPP_EAN_01_08_2007
+#define BOOST_PROTO_CONTEXT_DEFAULT_HPP_EAN_01_08_2007

#include <boost/config.hpp>
#include <boost/detail/workaround.hpp>
@@ -17,10 +17,10 @@
#include <boost/typeof/typeof.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/type_traits.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/tags.hpp>
-#include <boost/xpressive/proto3/eval.hpp>
-#include <boost/xpressive/proto3/traits.hpp> // for proto::arg_c()
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/tags.hpp>
+#include <boost/xpressive/proto/eval.hpp>
+#include <boost/xpressive/proto/traits.hpp> // for proto::arg_c()

// If we're generating doxygen documentation, hide all the nasty
// Boost.Typeof gunk.

Modified: branches/proto/v3/boost/xpressive/proto/context/null.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/context/null.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/context/null.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -8,12 +8,12 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_CONTEXT_NULL_HPP_EAN_06_24_2007
-#define BOOST_PROTO3_CONTEXT_NULL_HPP_EAN_06_24_2007
+#ifndef BOOST_PROTO_CONTEXT_NULL_HPP_EAN_06_24_2007
+#define BOOST_PROTO_CONTEXT_NULL_HPP_EAN_06_24_2007

-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/eval.hpp>
-#include <boost/xpressive/proto3/args.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/eval.hpp>
+#include <boost/xpressive/proto/args.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/debug.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/debug.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/debug.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,17 +6,17 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_DEBUG_HPP_EAN_12_31_2006
-#define BOOST_PROTO3_DEBUG_HPP_EAN_12_31_2006
+#ifndef BOOST_PROTO_DEBUG_HPP_EAN_12_31_2006
+#define BOOST_PROTO_DEBUG_HPP_EAN_12_31_2006

#if !defined(__WAVE__) || !defined(BOOST_PROTO_DOXYGEN_INVOKED)
#include <iomanip>
#include <iostream>
#include <typeinfo>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/expr.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/detail/dont_care.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/expr.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/detail/dont_care.hpp>
#else
/// INTERNAL ONLY
/// Needed to work around doxygen bug

Modified: branches/proto/v3/boost/xpressive/proto/deep_copy.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/deep_copy.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/deep_copy.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,14 +6,14 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_DEEP_COPY_HPP_EAN_11_21_2006
-#define BOOST_PROTO3_DEEP_COPY_HPP_EAN_11_21_2006
+#ifndef BOOST_PROTO_DEEP_COPY_HPP_EAN_11_21_2006
+#define BOOST_PROTO_DEEP_COPY_HPP_EAN_11_21_2006

-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/args.hpp>
-#include <boost/xpressive/proto3/expr.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/generate.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/args.hpp>
+#include <boost/xpressive/proto/expr.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/generate.hpp>

#define UNCV(X) \
typename remove_cv<X>::type
@@ -121,4 +121,4 @@
#undef UNREF
#undef UNCVREF

-#endif // BOOST_PROTO3_DEEP_COPY_HPP_EAN_11_21_2006
+#endif // BOOST_PROTO_DEEP_COPY_HPP_EAN_11_21_2006

Modified: branches/proto/v3/boost/xpressive/proto/detail/dont_care.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/detail/dont_care.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/detail/dont_care.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,8 +6,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_DETAIL_DONT_CARE_HPP_EAN_11_07_2007
-#define BOOST_PROTO3_DETAIL_DONT_CARE_HPP_EAN_11_07_2007
+#ifndef BOOST_PROTO_DETAIL_DONT_CARE_HPP_EAN_11_07_2007
+#define BOOST_PROTO_DETAIL_DONT_CARE_HPP_EAN_11_07_2007

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/domain.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/domain.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/domain.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -7,12 +7,12 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_DOMAIN_HPP_EAN_02_13_2007
-#define BOOST_PROTO3_DOMAIN_HPP_EAN_02_13_2007
+#ifndef BOOST_PROTO_DOMAIN_HPP_EAN_02_13_2007
+#define BOOST_PROTO_DOMAIN_HPP_EAN_02_13_2007

#include <boost/mpl/bool.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/generate.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/generate.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/eval.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/eval.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/eval.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,8 +6,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_EVAL_HPP_EAN_03_29_2007
-#define BOOST_PROTO3_EVAL_HPP_EAN_03_29_2007
+#ifndef BOOST_PROTO_EVAL_HPP_EAN_03_29_2007
+#define BOOST_PROTO_EVAL_HPP_EAN_03_29_2007

#include <boost/type_traits.hpp>

Modified: branches/proto/v3/boost/xpressive/proto/expr.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/expr.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/expr.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,16 +6,16 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_EXPR_HPP_EAN_10_28_2007
-#define BOOST_PROTO3_EXPR_HPP_EAN_10_28_2007
+#ifndef BOOST_PROTO_EXPR_HPP_EAN_10_28_2007
+#define BOOST_PROTO_EXPR_HPP_EAN_10_28_2007

#include <cstddef>
#include <boost/type_traits.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/utility/addressof.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/tags.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/tags.hpp>
+#include <boost/xpressive/proto/traits.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/extends.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/extends.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/extends.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,16 +6,16 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_EXTENDS_HPP_EAN_11_1_2006
-#define BOOST_PROTO3_EXTENDS_HPP_EAN_11_1_2006
+#ifndef BOOST_PROTO_EXTENDS_HPP_EAN_11_1_2006
+#define BOOST_PROTO_EXTENDS_HPP_EAN_11_1_2006

#include <boost/mpl/apply_wrap.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/expr.hpp>
-#include <boost/xpressive/proto3/args.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/generate.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/expr.hpp>
+#include <boost/xpressive/proto/args.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/generate.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/fusion.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/fusion.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/fusion.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,8 +6,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_FUSION_HPP_EAN_11_04_2006
-#define BOOST_PROTO3_FUSION_HPP_EAN_11_04_2006
+#ifndef BOOST_PROTO_FUSION_HPP_EAN_11_04_2006
+#define BOOST_PROTO_FUSION_HPP_EAN_11_04_2006

#include <boost/type_traits.hpp>
#include <boost/mpl/long.hpp>
@@ -25,8 +25,8 @@
#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
#include <boost/fusion/sequence/intrinsic/ext_/size_s.hpp>
#include <boost/fusion/view/ext_/segmented_iterator.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>

#define UNCV(x)\
typename remove_cv<x>::type

Modified: branches/proto/v3/boost/xpressive/proto/generate.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/generate.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/generate.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -7,13 +7,13 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_GENERATE_HPP_EAN_02_13_2007
-#define BOOST_PROTO3_GENERATE_HPP_EAN_02_13_2007
+#ifndef BOOST_PROTO_GENERATE_HPP_EAN_02_13_2007
+#define BOOST_PROTO_GENERATE_HPP_EAN_02_13_2007

#include <boost/mpl/long.hpp>
#include <boost/utility/enable_if.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/matches.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/matches.hpp>

#define UNREF(X) \
typename remove_reference<X>::type
@@ -149,4 +149,4 @@
#undef UNREF
#undef UNCVREF

-#endif // BOOST_PROTO3_GENERATE_HPP_EAN_02_13_2007
+#endif // BOOST_PROTO_GENERATE_HPP_EAN_02_13_2007

Modified: branches/proto/v3/boost/xpressive/proto/literal.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/literal.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/literal.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -7,13 +7,13 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_LITERAL_HPP_EAN_01_03_2007
-#define BOOST_PROTO3_LITERAL_HPP_EAN_01_03_2007
+#ifndef BOOST_PROTO_LITERAL_HPP_EAN_01_03_2007
+#define BOOST_PROTO_LITERAL_HPP_EAN_01_03_2007

-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/expr.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/extends.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/expr.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/extends.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/make_expr.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/make_expr.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/make_expr.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -7,8 +7,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_MAKE_EXPR_HPP_EAN_04_01_2005
-#define BOOST_PROTO3_MAKE_EXPR_HPP_EAN_04_01_2005
+#ifndef BOOST_PROTO_MAKE_EXPR_HPP_EAN_04_01_2005
+#define BOOST_PROTO_MAKE_EXPR_HPP_EAN_04_01_2005

#include <boost/version.hpp>
#include <boost/ref.hpp>
@@ -18,10 +18,10 @@
#include <boost/type_traits/is_same.hpp>
#include <boost/type_traits/add_reference.hpp>
#include <boost/type_traits/remove_reference.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/domain.hpp>
-#include <boost/xpressive/proto3/generate.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/domain.hpp>
+#include <boost/xpressive/proto/generate.hpp>
#include <boost/fusion/include/at.hpp>
#include <boost/fusion/include/value_at.hpp>
#include <boost/fusion/include/size.hpp>

Modified: branches/proto/v3/boost/xpressive/proto/matches.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/matches.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/matches.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,8 +6,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_MATCHES_HPP_EAN_10_28_2007
-#define BOOST_PROTO3_MATCHES_HPP_EAN_10_28_2007
+#ifndef BOOST_PROTO_MATCHES_HPP_EAN_10_28_2007
+#define BOOST_PROTO_MATCHES_HPP_EAN_10_28_2007

#include <boost/mpl/if.hpp>
#include <boost/mpl/bool.hpp>
@@ -18,8 +18,8 @@
#include <boost/mpl/eval_if.hpp>
#include <boost/mpl/apply_wrap.hpp>
#include <boost/type_traits.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/transform/arg.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/transform/arg.hpp>

// BUGBUG
#include <boost/mpl/aux_/template_arity.hpp>

Modified: branches/proto/v3/boost/xpressive/proto/operators.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/operators.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/operators.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,14 +6,14 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_OPERATORS_HPP_EAN_10_28_2007
-#define BOOST_PROTO3_OPERATORS_HPP_EAN_10_28_2007
+#ifndef BOOST_PROTO_OPERATORS_HPP_EAN_10_28_2007
+#define BOOST_PROTO_OPERATORS_HPP_EAN_10_28_2007

#include <boost/mpl/logical.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/preprocessor/punctuation/comma.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/make_expr.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/make_expr.hpp>

#define UNREF(X) typename remove_reference<X>::type

Modified: branches/proto/v3/boost/xpressive/proto/proto.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/proto.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/proto.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,25 +6,25 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_PROTO_EAN_10_28_2007
-#define BOOST_PROTO3_PROTO_EAN_10_28_2007
+#ifndef BOOST_PROTO_PROTO_EAN_10_28_2007
+#define BOOST_PROTO_PROTO_EAN_10_28_2007

-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/args.hpp>
-#include <boost/xpressive/proto3/tags.hpp>
-#include <boost/xpressive/proto3/eval.hpp>
-#include <boost/xpressive/proto3/expr.hpp>
-#include <boost/xpressive/proto3/debug.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/domain.hpp>
-#include <boost/xpressive/proto3/matches.hpp>
-#include <boost/xpressive/proto3/extends.hpp>
-#include <boost/xpressive/proto3/literal.hpp>
-#include <boost/xpressive/proto3/generate.hpp>
-#include <boost/xpressive/proto3/operators.hpp>
-#include <boost/xpressive/proto3/deep_copy.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
-#include <boost/xpressive/proto3/fusion.hpp>
-#include <boost/xpressive/proto3/make_expr.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/args.hpp>
+#include <boost/xpressive/proto/tags.hpp>
+#include <boost/xpressive/proto/eval.hpp>
+#include <boost/xpressive/proto/expr.hpp>
+#include <boost/xpressive/proto/debug.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/domain.hpp>
+#include <boost/xpressive/proto/matches.hpp>
+#include <boost/xpressive/proto/extends.hpp>
+#include <boost/xpressive/proto/literal.hpp>
+#include <boost/xpressive/proto/generate.hpp>
+#include <boost/xpressive/proto/operators.hpp>
+#include <boost/xpressive/proto/deep_copy.hpp>
+#include <boost/xpressive/proto/transform.hpp>
+#include <boost/xpressive/proto/fusion.hpp>
+#include <boost/xpressive/proto/make_expr.hpp>

#endif

Modified: branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/proto_fwd.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,8 +6,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_PROTO_FWD_EAN_10_28_2007
-#define BOOST_PROTO3_PROTO_FWD_EAN_10_28_2007
+#ifndef BOOST_PROTO_PROTO_FWD_EAN_10_28_2007
+#define BOOST_PROTO_PROTO_FWD_EAN_10_28_2007

#include <climits> // for INT_MAX
#include <boost/type_traits.hpp>

Modified: branches/proto/v3/boost/xpressive/proto/proto_typeof.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/proto_typeof.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/proto_typeof.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -7,13 +7,13 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_PROTO_TYPEOF_H
-#define BOOST_PROTO3_PROTO_TYPEOF_H
+#ifndef BOOST_PROTO_PROTO_TYPEOF_H
+#define BOOST_PROTO_PROTO_TYPEOF_H

#include <boost/config.hpp>
#include <boost/typeof/typeof.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/deep_copy.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/deep_copy.hpp>
#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()

BOOST_TYPEOF_REGISTER_TYPE(boost::proto::tag::terminal)

Modified: branches/proto/v3/boost/xpressive/proto/tags.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/tags.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/tags.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,10 +6,10 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TAGS_HPP_EAN_10_28_2007
-#define BOOST_PROTO3_TAGS_HPP_EAN_10_28_2007
+#ifndef BOOST_PROTO_TAGS_HPP_EAN_10_28_2007
+#define BOOST_PROTO_TAGS_HPP_EAN_10_28_2007

-#include <boost/xpressive/proto3/proto_fwd.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/traits.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/traits.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/traits.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,13 +6,13 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRAITS_HPP_EAN_10_28_2007
-#define BOOST_PROTO3_TRAITS_HPP_EAN_10_28_2007
+#ifndef BOOST_PROTO_TRAITS_HPP_EAN_10_28_2007
+#define BOOST_PROTO_TRAITS_HPP_EAN_10_28_2007

#include <boost/type_traits.hpp>
#include <boost/mpl/logical.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/args.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/args.hpp>

#define CV(T)\
typename add_const<T>::type

Modified: branches/proto/v3/boost/xpressive/proto/transform.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,14 +6,14 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRANSFORM_HPP_EAN_10_29_2007
-#define BOOST_PROTO3_TRANSFORM_HPP_EAN_10_29_2007
+#ifndef BOOST_PROTO_TRANSFORM_HPP_EAN_10_29_2007
+#define BOOST_PROTO_TRANSFORM_HPP_EAN_10_29_2007

-#include <boost/xpressive/proto3/transform/apply.hpp>
-#include <boost/xpressive/proto3/transform/arg.hpp>
-#include <boost/xpressive/proto3/transform/bind.hpp>
-#include <boost/xpressive/proto3/transform/fold.hpp>
-#include <boost/xpressive/proto3/transform/fold_tree.hpp>
-#include <boost/xpressive/proto3/transform/when.hpp>
+#include <boost/xpressive/proto/transform/apply.hpp>
+#include <boost/xpressive/proto/transform/arg.hpp>
+#include <boost/xpressive/proto/transform/bind.hpp>
+#include <boost/xpressive/proto/transform/fold.hpp>
+#include <boost/xpressive/proto/transform/fold_tree.hpp>
+#include <boost/xpressive/proto/transform/when.hpp>

#endif

Modified: branches/proto/v3/boost/xpressive/proto/transform/apply.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/apply.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/apply.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,13 +6,13 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRANSFORM_APPLY_HPP_EAN_11_02_2007
-#define BOOST_PROTO3_TRANSFORM_APPLY_HPP_EAN_11_02_2007
+#ifndef BOOST_PROTO_TRANSFORM_APPLY_HPP_EAN_11_02_2007
+#define BOOST_PROTO_TRANSFORM_APPLY_HPP_EAN_11_02_2007

#include <boost/type_traits.hpp>
#include <boost/utility/result_of.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/transform/arg.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/arg.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/arg.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,11 +6,11 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRANSFORM_ARG_HPP_EAN_11_01_2007
-#define BOOST_PROTO3_TRANSFORM_ARG_HPP_EAN_11_01_2007
+#ifndef BOOST_PROTO_TRANSFORM_ARG_HPP_EAN_11_01_2007
+#define BOOST_PROTO_TRANSFORM_ARG_HPP_EAN_11_01_2007

-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/transform/bind.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/bind.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/bind.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,12 +6,12 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRANSFORM_BIND_HPP_EAN_11_02_2007
-#define BOOST_PROTO3_TRANSFORM_BIND_HPP_EAN_11_02_2007
+#ifndef BOOST_PROTO_TRANSFORM_BIND_HPP_EAN_11_02_2007
+#define BOOST_PROTO_TRANSFORM_BIND_HPP_EAN_11_02_2007

#include <boost/utility/result_of.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/transform/fold.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/fold.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/fold.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,14 +6,14 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRANSFORM_FOLD_HPP_EAN_11_04_2007
-#define BOOST_PROTO3_TRANSFORM_FOLD_HPP_EAN_11_04_2007
+#ifndef BOOST_PROTO_TRANSFORM_FOLD_HPP_EAN_11_04_2007
+#define BOOST_PROTO_TRANSFORM_FOLD_HPP_EAN_11_04_2007

#include <boost/fusion/include/fold.hpp>
#include <boost/fusion/include/reverse.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/fusion.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/fusion.hpp>
+#include <boost/xpressive/proto/traits.hpp>

#define UNREF(T)\
typename remove_reference<T>::type

Modified: branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/fold_tree.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,14 +6,14 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRANSFORM_FOLD_TREE_HPP_EAN_11_05_2007
-#define BOOST_PROTO3_TRANSFORM_FOLD_TREE_HPP_EAN_11_05_2007
+#ifndef BOOST_PROTO_TRANSFORM_FOLD_TREE_HPP_EAN_11_05_2007
+#define BOOST_PROTO_TRANSFORM_FOLD_TREE_HPP_EAN_11_05_2007

#include <boost/mpl/placeholders.hpp>
#include <boost/type_traits.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
-#include <boost/xpressive/proto3/transform/fold.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>
+#include <boost/xpressive/proto/transform/fold.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/proto/transform/when.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/proto/transform/when.hpp (original)
+++ branches/proto/v3/boost/xpressive/proto/transform/when.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,8 +6,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#ifndef BOOST_PROTO3_TRANSFORM_CASE_HPP_EAN_10_29_2007
-#define BOOST_PROTO3_TRANSFORM_CASE_HPP_EAN_10_29_2007
+#ifndef BOOST_PROTO_TRANSFORM_CASE_HPP_EAN_10_29_2007
+#define BOOST_PROTO_TRANSFORM_CASE_HPP_EAN_10_29_2007

#include <boost/mpl/bool.hpp>
#include <boost/mpl/logical.hpp>
@@ -16,9 +16,9 @@
#include <boost/mpl/aux_/has_type.hpp>
#include <boost/type_traits.hpp>
#include <boost/utility/enable_if.hpp>
-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/transform/bind.hpp>
-#include <boost/xpressive/proto3/transform/apply.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/transform/bind.hpp>
+#include <boost/xpressive/proto/transform/apply.hpp>

namespace boost { namespace proto
{

Modified: branches/proto/v3/boost/xpressive/regex_primitives.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/regex_primitives.hpp (original)
+++ branches/proto/v3/boost/xpressive/regex_primitives.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -21,8 +21,8 @@

// Doxygen can't handle proto :-(
#ifndef BOOST_XPRESSIVE_DOXYGEN_INVOKED
-# include <boost/xpressive/proto3/proto.hpp>
-# include <boost/xpressive/proto3/transform/arg.hpp>
+# include <boost/xpressive/proto/proto.hpp>
+# include <boost/xpressive/proto/transform/arg.hpp>
# include <boost/xpressive/detail/core/icase.hpp>
# include <boost/xpressive/detail/static/compile.hpp>
# include <boost/xpressive/detail/static/modifier.hpp>

Modified: branches/proto/v3/boost/xpressive/xpressive_fwd.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/xpressive_fwd.hpp (original)
+++ branches/proto/v3/boost/xpressive/xpressive_fwd.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -50,8 +50,8 @@
# endif
#endif

-#include <boost/xpressive/proto3/proto_fwd.hpp>
-#include <boost/xpressive/proto3/traits.hpp>
+#include <boost/xpressive/proto/proto_fwd.hpp>
+#include <boost/xpressive/proto/traits.hpp>

namespace boost { namespace xpressive
{

Modified: branches/proto/v3/boost/xpressive/xpressive_typeof.hpp
==============================================================================
--- branches/proto/v3/boost/xpressive/xpressive_typeof.hpp (original)
+++ branches/proto/v3/boost/xpressive/xpressive_typeof.hpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -19,7 +19,7 @@
#ifndef BOOST_NO_STL_LOCALE
# include <boost/typeof/std/locale.hpp>
#endif
-#include <boost/xpressive/proto3/proto_typeof.hpp>
+#include <boost/xpressive/proto/proto_typeof.hpp>
#include <boost/xpressive/detail/detail_fwd.hpp>

#include BOOST_TYPEOF_INCREMENT_REGISTRATION_GROUP()

Modified: branches/proto/v3/libs/xpressive/proto/example/calc1.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/calc1.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/calc1.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -8,8 +8,8 @@

#include <iostream>
#include <boost/mpl/int.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
using namespace boost;

template<typename I> struct arg {};

Modified: branches/proto/v3/libs/xpressive/proto/example/calc2.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/calc2.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/calc2.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -10,8 +10,8 @@

#include <iostream>
#include <boost/mpl/int.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
using namespace boost;

// Will be used to define the placeholders _1 and _2

Modified: branches/proto/v3/libs/xpressive/proto/example/calc3.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/calc3.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/calc3.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -13,9 +13,9 @@
#include <boost/mpl/int.hpp>
#include <boost/mpl/assert.hpp>
#include <boost/mpl/min_max.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
+#include <boost/xpressive/proto/transform.hpp>
using namespace boost;

// Will be used to define the placeholders _1 and _2

Modified: branches/proto/v3/libs/xpressive/proto/example/hello.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/hello.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/hello.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -5,8 +5,8 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <iostream>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
#include <boost/typeof/std/ostream.hpp>
using namespace boost;

Modified: branches/proto/v3/libs/xpressive/proto/example/lazy_vector.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/lazy_vector.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/lazy_vector.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -15,8 +15,8 @@
#include <vector>
#include <iostream>
#include <boost/mpl/int.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
using namespace boost;

using proto::_;

Modified: branches/proto/v3/libs/xpressive/proto/example/mixed.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/mixed.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/mixed.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -15,9 +15,9 @@
#include <complex>
#include <iostream>
#include <stdexcept>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/debug.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/debug.hpp>
+#include <boost/xpressive/proto/context.hpp>
#include <boost/typeof/std/list.hpp>
#include <boost/typeof/std/vector.hpp>
#include <boost/typeof/std/complex.hpp>

Modified: branches/proto/v3/libs/xpressive/proto/example/rgb.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/rgb.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/rgb.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -10,8 +10,8 @@
// from PETE (http://www.codesourcery.com/pooma/download.html).

#include <iostream>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/transform.hpp>
using namespace boost::proto;

struct RedTag

Modified: branches/proto/v3/libs/xpressive/proto/example/tarray.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/tarray.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/tarray.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -11,8 +11,8 @@

#include <iostream>
#include <boost/mpl/int.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
using namespace boost;

// This grammar describes which TArray expressions

Modified: branches/proto/v3/libs/xpressive/proto/example/vec3.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/vec3.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/vec3.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -13,10 +13,10 @@
#include <iostream>
#include <functional>
#include <boost/mpl/int.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
-#include <boost/xpressive/proto3/proto_typeof.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
+#include <boost/xpressive/proto/proto_typeof.hpp>
+#include <boost/xpressive/proto/transform.hpp>
using namespace boost::proto;
using namespace transform;
namespace mpl = boost::mpl;

Modified: branches/proto/v3/libs/xpressive/proto/example/vector.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/example/vector.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/example/vector.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -11,9 +11,9 @@
#include <vector>
#include <iostream>
#include <stdexcept>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/debug.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/debug.hpp>
+#include <boost/xpressive/proto/context.hpp>

using namespace boost;
using proto::_;

Modified: branches/proto/v3/libs/xpressive/proto/test/calculator.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/calculator.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/calculator.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -5,8 +5,8 @@
// Software License, Version 1.0. (See accompanying file
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
#include <boost/test/unit_test.hpp>

using namespace boost;

Modified: branches/proto/v3/libs/xpressive/proto/test/examples.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/examples.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/examples.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -8,11 +8,11 @@
#include <iostream>
#include <boost/config.hpp>
#include <boost/mpl/min_max.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
-#include <boost/xpressive/proto3/transform/arg.hpp>
-#include <boost/xpressive/proto3/transform/fold.hpp>
-#include <boost/xpressive/proto3/transform/fold_tree.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/transform.hpp>
+#include <boost/xpressive/proto/transform/arg.hpp>
+#include <boost/xpressive/proto/transform/fold.hpp>
+#include <boost/xpressive/proto/transform/fold_tree.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/fusion/include/cons.hpp>
#include <boost/fusion/include/pop_front.hpp>

Modified: branches/proto/v3/libs/xpressive/proto/test/lambda.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/lambda.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/lambda.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -25,9 +25,9 @@
#include <boost/typeof/std/iostream.hpp>
#include <boost/type_traits/add_const.hpp>
#include <boost/type_traits/add_reference.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/context.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/context.hpp>
+#include <boost/xpressive/proto/transform.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/test/floating_point_comparison.hpp>

Modified: branches/proto/v3/libs/xpressive/proto/test/main.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/main.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/main.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -8,9 +8,9 @@
#include <boost/fusion/include/cons.hpp>
#include <boost/fusion/include/pop_front.hpp>
#include <boost/fusion/include/reverse.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
-#include <boost/xpressive/proto3/context.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/transform.hpp>
+#include <boost/xpressive/proto/context.hpp>

namespace boost { namespace fusion
{

Modified: branches/proto/v3/libs/xpressive/proto/test/make_expr.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/make_expr.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/make_expr.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -6,7 +6,7 @@
// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

#include <sstream>
-#include <boost/xpressive/proto3/proto.hpp>
+#include <boost/xpressive/proto/proto.hpp>
#include <boost/fusion/include/vector.hpp>
#include <boost/test/unit_test.hpp>

Modified: branches/proto/v3/libs/xpressive/proto/test/matches.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/matches.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/matches.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -10,8 +10,8 @@
#include <boost/mpl/assert.hpp>
#include <boost/mpl/placeholders.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/transform.hpp>
#include <boost/test/unit_test.hpp>

using namespace boost;

Modified: branches/proto/v3/libs/xpressive/proto/test/proto_fusion.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/proto_fusion.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/proto_fusion.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -10,8 +10,8 @@
# error This test only works on Boost v1.35
#endif

-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/fusion.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/fusion.hpp>
#include <boost/fusion/include/for_each.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/utility/addressof.hpp>

Modified: branches/proto/v3/libs/xpressive/proto/test/proto_fusion_s.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/proto_fusion_s.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/proto_fusion_s.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -10,8 +10,8 @@
# error This test only works on Boost v1.35
#endif

-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/fusion.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/fusion.hpp>
#include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
#include <boost/test/unit_test.hpp>
#include <boost/utility/addressof.hpp>

Modified: branches/proto/v3/libs/xpressive/proto/test/toy_spirit.cpp
==============================================================================
--- branches/proto/v3/libs/xpressive/proto/test/toy_spirit.cpp (original)
+++ branches/proto/v3/libs/xpressive/proto/test/toy_spirit.cpp 2007-11-30 21:42:42 EST (Fri, 30 Nov 2007)
@@ -15,8 +15,8 @@
#include <boost/mpl/assert.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/type_traits/is_same.hpp>
-#include <boost/xpressive/proto3/proto.hpp>
-#include <boost/xpressive/proto3/transform.hpp>
+#include <boost/xpressive/proto/proto.hpp>
+#include <boost/xpressive/proto/transform.hpp>
#if BOOST_VERSION < 103500
# include <boost/spirit/fusion/algorithm/for_each.hpp>
# include <boost/spirit/fusion/algorithm/fold.hpp>

Date view	Thread view	Subject view	Author view

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