[Boost-commit] svn:boost r81721 - in trunk/boost/spirit/home/support: . detail

Subject: [Boost-commit] svn:boost r81721 - in trunk/boost/spirit/home/support: . detail
From: joel_at_[hidden]
Date: 2012-12-05 08:43:01

Author: djowel
Date: 2012-12-05 08:43:00 EST (Wed, 05 Dec 2012)
New Revision: 81721
URL: http://svn.boost.org/trac/boost/changeset/81721

Log:
Renamed nil to nil_
Text files modified: 
   trunk/boost/spirit/home/support/context.hpp          |     2 +-                                      
   trunk/boost/spirit/home/support/detail/make_cons.hpp |     5 ++---                                   
   trunk/boost/spirit/home/support/info.hpp             |     8 ++++----                                
   trunk/boost/spirit/home/support/make_component.hpp   |     2 +-                                      
   4 files changed, 8 insertions(+), 9 deletions(-)

Modified: trunk/boost/spirit/home/support/context.hpp
==============================================================================
--- trunk/boost/spirit/home/support/context.hpp	(original)
+++ trunk/boost/spirit/home/support/context.hpp	2012-12-05 08:43:00 EST (Wed, 05 Dec 2012)
@@ -98,7 +98,7 @@
         typedef Locals locals_type;
 
         context(typename Attributes::car_type attribute)
-          : attributes(attribute, fusion::nil()), locals() {}
+          : attributes(attribute, fusion::nil_()), locals() {}
 
         template <typename Args, typename Context>
         context(

Modified: trunk/boost/spirit/home/support/detail/make_cons.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/make_cons.hpp	(original)
+++ trunk/boost/spirit/home/support/detail/make_cons.hpp	2012-12-05 08:43:00 EST (Wed, 05 Dec 2012)
@@ -42,11 +42,10 @@
 
     namespace result_of
     {
-        template <typename Car, typename Cdr = fusion::nil>
+        template <typename Car, typename Cdr = fusion::nil_>
         struct make_cons
         {
-            typedef typename as_meta_element<Car>::type car_type;
-            typedef typename fusion::cons<car_type, Cdr> type;
+            typedef typename as_meta_element<Car>::type car_type;            typedef typename fusion::cons<car_type, Cdr> type;
         };
     }
 

Modified: trunk/boost/spirit/home/support/info.hpp
==============================================================================
--- trunk/boost/spirit/home/support/info.hpp	(original)
+++ trunk/boost/spirit/home/support/info.hpp	2012-12-05 08:43:00 EST (Wed, 05 Dec 2012)
@@ -28,11 +28,11 @@
     // for uniformity.
     struct info
     {
-        struct nil {};
+        struct nil_ {};
 
         typedef
             boost::variant<
-                nil
+                nil_
               , utf8_string
               , recursive_wrapper<info>
               , recursive_wrapper<std::pair<info, info> >
@@ -41,7 +41,7 @@
         value_type;
 
         explicit info(utf8_string const& tag_)
-          : tag(tag_), value(nil()) {}
+          : tag(tag_), value(nil_()) {}
 
         template <typename T>
         info(utf8_string const& tag_, T const& value_)
@@ -78,7 +78,7 @@
         basic_info_walker(Callback& callback_, utf8_string const& tag_, int depth_)
           : callback(callback_), tag(tag_), depth(depth_) {}
 
-        void operator()(info::nil) const
+        void operator()(info::nil_) const
         {
             callback.element(tag, "", depth);
         }

Modified: trunk/boost/spirit/home/support/make_component.hpp
==============================================================================
--- trunk/boost/spirit/home/support/make_component.hpp	(original)
+++ trunk/boost/spirit/home/support/make_component.hpp	2012-12-05 08:43:00 EST (Wed, 05 Dec 2012)
@@ -258,7 +258,7 @@
             typedef typename
                 proto::reverse_fold_tree<
                     proto::_
-                  , proto::make<fusion::nil>
+                  , proto::make<fusion::nil_>
                   , make_binary_helper<Grammar>
                 >::template impl<Expr, State, Data>
             reverse_fold_tree;