Subject: [Boost-commit] svn:boost r74368 - trunk/boost/proto
From: eric_at_[hidden]
Date: 2011-09-13 12:21:40
Author: eric_niebler
Date: 2011-09-13 12:21:39 EDT (Tue, 13 Sep 2011)
New Revision: 74368
URL: http://svn.boost.org/trac/boost/changeset/74368
Log:
move proto tags into adl-blocking namespace
Text files modified:
trunk/boost/proto/debug.hpp | 4
trunk/boost/proto/proto_fwd.hpp | 113 ++++++++++++++++++++-------------------
trunk/boost/proto/tags.hpp | 4
3 files changed, 63 insertions(+), 58 deletions(-)
Modified: trunk/boost/proto/debug.hpp
==============================================================================
--- trunk/boost/proto/debug.hpp (original)
+++ trunk/boost/proto/debug.hpp 2011-09-13 12:21:39 EDT (Tue, 13 Sep 2011)
@@ -22,7 +22,7 @@
namespace boost { namespace proto
{
- namespace tag
+ namespace tagns_ { namespace tag
{
#define BOOST_PROTO_DEFINE_TAG_INSERTION(Tag) \
/** \brief INTERNAL ONLY */ \
@@ -80,7 +80,7 @@
BOOST_PROTO_DEFINE_TAG_INSERTION(function)
#undef BOOST_PROTO_DEFINE_TAG_INSERTION
- }
+ }}
namespace hidden_detail_
{
Modified: trunk/boost/proto/proto_fwd.hpp
==============================================================================
--- trunk/boost/proto/proto_fwd.hpp (original)
+++ trunk/boost/proto/proto_fwd.hpp 2011-09-13 12:21:39 EDT (Tue, 13 Sep 2011)
@@ -207,63 +207,68 @@
///////////////////////////////////////////////////////////////////////////////
// Operator tags
- namespace tag
+ namespace tagns_
{
- struct terminal;
- struct unary_plus;
- struct negate;
- struct dereference;
- struct complement;
- struct address_of;
- struct logical_not;
- struct pre_inc;
- struct pre_dec;
- struct post_inc;
- struct post_dec;
-
- struct shift_left;
- struct shift_right;
- struct multiplies;
- struct divides;
- struct modulus;
- struct plus;
- struct minus;
- struct less;
- struct greater;
- struct less_equal;
- struct greater_equal;
- struct equal_to;
- struct not_equal_to;
- struct logical_or;
- struct logical_and;
- struct bitwise_and;
- struct bitwise_or;
- struct bitwise_xor;
- struct comma;
- struct mem_ptr;
-
- struct assign;
- struct shift_left_assign;
- struct shift_right_assign;
- struct multiplies_assign;
- struct divides_assign;
- struct modulus_assign;
- struct plus_assign;
- struct minus_assign;
- struct bitwise_and_assign;
- struct bitwise_or_assign;
- struct bitwise_xor_assign;
- struct subscript;
- struct member;
- struct if_else_;
- struct function;
-
- // Fusion tags
- struct proto_expr;
- struct proto_expr_iterator;
- struct proto_flat_view;
+ namespace tag
+ {
+ struct terminal;
+ struct unary_plus;
+ struct negate;
+ struct dereference;
+ struct complement;
+ struct address_of;
+ struct logical_not;
+ struct pre_inc;
+ struct pre_dec;
+ struct post_inc;
+ struct post_dec;
+
+ struct shift_left;
+ struct shift_right;
+ struct multiplies;
+ struct divides;
+ struct modulus;
+ struct plus;
+ struct minus;
+ struct less;
+ struct greater;
+ struct less_equal;
+ struct greater_equal;
+ struct equal_to;
+ struct not_equal_to;
+ struct logical_or;
+ struct logical_and;
+ struct bitwise_and;
+ struct bitwise_or;
+ struct bitwise_xor;
+ struct comma;
+ struct mem_ptr;
+
+ struct assign;
+ struct shift_left_assign;
+ struct shift_right_assign;
+ struct multiplies_assign;
+ struct divides_assign;
+ struct modulus_assign;
+ struct plus_assign;
+ struct minus_assign;
+ struct bitwise_and_assign;
+ struct bitwise_or_assign;
+ struct bitwise_xor_assign;
+ struct subscript;
+ struct member;
+ struct if_else_;
+ struct function;
+
+ // Fusion tags
+ struct proto_expr;
+ struct proto_expr_iterator;
+ struct proto_flat_view;
+ }
}
+ using namespace tagns_;
+
////////////////////////////////////////////////////////////////////////////////////////////////
struct _;
Modified: trunk/boost/proto/tags.hpp
==============================================================================
--- trunk/boost/proto/tags.hpp (original)
+++ trunk/boost/proto/tags.hpp 2011-09-13 12:21:39 EDT (Tue, 13 Sep 2011)
@@ -11,7 +11,7 @@
#include <boost/proto/proto_fwd.hpp>
-namespace boost { namespace proto { namespace tag
+namespace boost { namespace proto { namespace tagns_ { namespace tag
{
/// Tag type for terminals; aka, leaves in the expression tree.
@@ -152,6 +152,6 @@
/// Tag type for the n-ary function call operator.
struct function {};
-}}}
+}}}}
#endif