[Boost-commit] svn:boost r58049 - in trunk/boost/spirit/home: karma/auto qi/auto

Subject: [Boost-commit] svn:boost r58049 - in trunk/boost/spirit/home: karma/auto qi/auto
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-29 19:38:32

Author: hkaiser
Date: 2009-11-29 19:38:32 EST (Sun, 29 Nov 2009)
New Revision: 58049
URL: http://svn.boost.org/trac/boost/changeset/58049

Log:
Spirit: tweaks for auto_
Text files modified: 
   trunk/boost/spirit/home/karma/auto/create_generator.hpp |    18 +++++++++---------                      
   trunk/boost/spirit/home/qi/auto/create_parser.hpp       |    18 +++++++++---------                      
   2 files changed, 18 insertions(+), 18 deletions(-)

Modified: trunk/boost/spirit/home/karma/auto/create_generator.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/auto/create_generator.hpp	(original)
+++ trunk/boost/spirit/home/karma/auto/create_generator.hpp	2009-11-29 19:38:32 EST (Sun, 29 Nov 2009)
@@ -13,29 +13,29 @@
 #include <boost/spirit/home/karma/auto/meta_create.hpp>
 #include <boost/proto/deep_copy.hpp>
 
-namespace boost { namespace spirit { namespace karma
+namespace boost { namespace spirit { namespace result_of
 {
     ///////////////////////////////////////////////////////////////////////////
     template <typename T>
-    struct generator_creator
+    struct create_generator
     {
         typedef spirit::meta_create<karma::domain, T> creator_type;
+
         typedef typename proto::result_of::deep_copy<
             typename creator_type::type
         >::type type;
-
-        static type call()
-        {
-            return proto::deep_copy(creator_type::call());
-        }
     };
+}}}
 
+namespace boost { namespace spirit { namespace karma
+{
     ///////////////////////////////////////////////////////////////////////////
     template <typename T>
-    typename generator_creator<T>::type
+    typename result_of::create_generator<T>::type
     create_generator()
     {
-        return generator_creator<T>::call();
+        typedef typename result_of::create_generator<T>::creator_type creator_type;
+        return proto::deep_copy(creator_type::call());
     }
 }}}
 

Modified: trunk/boost/spirit/home/qi/auto/create_parser.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/auto/create_parser.hpp	(original)
+++ trunk/boost/spirit/home/qi/auto/create_parser.hpp	2009-11-29 19:38:32 EST (Sun, 29 Nov 2009)
@@ -13,29 +13,29 @@
 #include <boost/spirit/home/qi/auto/meta_create.hpp>
 #include <boost/proto/deep_copy.hpp>
 
-namespace boost { namespace spirit { namespace qi
+namespace boost { namespace spirit { namespace result_of
 {
     ///////////////////////////////////////////////////////////////////////////
     template <typename T>
-    struct parser_creator
+    struct create_parser
     {
         typedef spirit::meta_create<qi::domain, T> creator_type;
+
         typedef typename proto::result_of::deep_copy<
             typename creator_type::type
         >::type type;
-
-        static type call()
-        {
-            return proto::deep_copy(creator_type::call());
-        }
     };
+}}}
 
+namespace boost { namespace spirit { namespace qi
+{
     ///////////////////////////////////////////////////////////////////////////
     template <typename T>
-    typename parser_creator<T>::type
+    typename result_of::create_parser<T>::type
     create_parser()
     {
-        return parser_creator<T>::call();
+        typedef typename result_of::create_parser<T>::creator_type creator_type;
+        return proto::deep_copy(creator_type::call());
     }
 }}}