Update of /cvsroot/boost/boost/boost/xpressive/proto
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5404/proto

Modified Files:
        deep_copy.hpp expr.hpp ref.hpp traits.hpp 
Log Message:
rename Expr::id to Expr::id_type

Index: deep_copy.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/deep_copy.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- deep_copy.hpp       21 Nov 2006 17:28:15 -0000      1.1
+++ deep_copy.hpp       21 Nov 2006 17:33:47 -0000      1.2
@@ -40,12 +40,12 @@
             template<typename Expr>
             struct deep_copy
             {
-                typedef typename Expr::id type;
+                typedef typename Expr::id_type type;
             };
         }
 
         template<typename Expr>
-        typename Expr::id deep_copy(Expr const &expr)
+        typename Expr::id_type deep_copy(Expr const &expr)
         {
             return detail::deep_copy_impl<Expr>::call(expr);
         }
@@ -74,10 +74,9 @@
             template<typename Expr, typename Tag>
             struct deep_copy_impl<Expr, Tag, N>
             {
-                static typename Expr::id
-                call(Expr const &expr)
+                static typename Expr::id_type call(Expr const &expr)
                 {
-                    typename Expr::id that = {
+                    typename Expr::id_type that = {
                         BOOST_PP_ENUM(N, BOOST_PROTO_DEFINE_DEEP_COPY, ~)
                     };
                     return that;

Index: expr.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/expr.hpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- expr.hpp    21 Nov 2006 17:28:15 -0000      1.2
+++ expr.hpp    21 Nov 2006 17:33:47 -0000      1.3
@@ -98,10 +98,10 @@
             typedef expr
     #if BOOST_PP_ITERATION_FLAGS() == 1
                 <tag_type, BOOST_PP_CAT(args, BOOST_PP_ITERATION()) <
-                    BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_ITERATION(), typename 
Args::arg, ::expr_type::id BOOST_PP_INTERCEPT)
+                    BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_ITERATION(), typename 
Args::arg, ::expr_type::id_type BOOST_PP_INTERCEPT)
                 > >
     #endif
-            id;
+            id_type;
 
             expr const &cast() const
             {

Index: ref.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/ref.hpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ref.hpp     21 Nov 2006 17:28:15 -0000      1.8
+++ ref.hpp     21 Nov 2006 17:33:47 -0000      1.9
@@ -25,7 +25,7 @@
         typedef typename Expr::tag_type tag_type;
         typedef typename Expr::args_type args_type;
         typedef typename Expr::arity arity;
-        typedef typename Expr::id id;
+        typedef typename Expr::id_type id_type;
         typedef proto_ref_tag fusion_tag;
         typedef void is_boost_proto_ref_;
         typedef void is_boost_proto_expr_;

Index: traits.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/xpressive/proto/traits.hpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- traits.hpp  21 Nov 2006 17:28:15 -0000      1.17
+++ traits.hpp  21 Nov 2006 17:33:47 -0000      1.18
@@ -214,7 +214,7 @@
             template<typename Expr>
             struct id
             {
-                typedef typename Expr::expr_type::id type;
+                typedef typename Expr::id_type type;
             };
 
         #define BOOST_PP_ITERATION_PARAMS_1 (3, (0, BOOST_PROTO_MAX_ARITY, 
<boost/xpressive/proto/traits.hpp>))


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to