[Boost-commit] svn:boost r60350 - in trunk/boost/spirit/home/karma: auto char

Subject: [Boost-commit] svn:boost r60350 - in trunk/boost/spirit/home/karma: auto char
From: hartmut.kaiser_at_[hidden]
Date: 2010-03-08 09:05:05

Author: hkaiser
Date: 2010-03-08 09:05:04 EST (Mon, 08 Mar 2010)
New Revision: 60350
URL: http://svn.boost.org/trac/boost/changeset/60350

Log:
Spirit: removing default?encoding from Karma
Text files modified: 
   trunk/boost/spirit/home/karma/auto/meta_create.hpp |    40 ++++++++++++++++++++--------------------
   trunk/boost/spirit/home/karma/char/char.hpp        |     8 ++++----                                
   trunk/boost/spirit/home/karma/char/char_class.hpp  |     2 --                                      
   3 files changed, 24 insertions(+), 26 deletions(-)

Modified: trunk/boost/spirit/home/karma/auto/meta_create.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/auto/meta_create.hpp	(original)
+++ trunk/boost/spirit/home/karma/auto/meta_create.hpp	2010-03-08 09:05:04 EST (Mon, 08 Mar 2010)
@@ -51,57 +51,57 @@
     template <typename String> 
     struct meta_create_string 
     {
-        typedef spirit::default_encoding::string_type type; 
-        static type const& call() { return spirit::default_encoding::string; }
+        typedef spirit::standard::string_type type; 
+        static type const& call() { return spirit::standard::string; }
     };
 
     template <> 
     struct meta_create_string<wchar_t*>
     {
-        typedef spirit::default_wide_encoding::string_type type; 
-        static type const& call() { return spirit::default_wide_encoding::string; }
+        typedef spirit::standard_wide::string_type type; 
+        static type const& call() { return spirit::standard_wide::string; }
     };
 
     template <> 
     struct meta_create_string<wchar_t const*>
     {
-        typedef spirit::default_wide_encoding::string_type type; 
-        static type const& call() { return spirit::default_wide_encoding::string; }
+        typedef spirit::standard_wide::string_type type; 
+        static type const& call() { return spirit::standard_wide::string; }
     };
 
     template <int N> 
     struct meta_create_string<wchar_t[N]>
     {
-        typedef spirit::default_wide_encoding::string_type type; 
-        static type const& call() { return spirit::default_wide_encoding::string; }
+        typedef spirit::standard_wide::string_type type; 
+        static type const& call() { return spirit::standard_wide::string; }
     };
 
     template <int N> 
     struct meta_create_string<wchar_t const[N]>
     {
-        typedef spirit::default_wide_encoding::string_type type; 
-        static type const& call() { return spirit::default_wide_encoding::string; }
+        typedef spirit::standard_wide::string_type type; 
+        static type const& call() { return spirit::standard_wide::string; }
     };
 
     template <int N> 
     struct meta_create_string<wchar_t(&)[N]>
     {
-        typedef spirit::default_wide_encoding::string_type type; 
-        static type const& call() { return spirit::default_wide_encoding::string; }
+        typedef spirit::standard_wide::string_type type; 
+        static type const& call() { return spirit::standard_wide::string; }
     };
 
     template <int N> 
     struct meta_create_string<wchar_t const(&)[N]>
     {
-        typedef spirit::default_wide_encoding::string_type type; 
-        static type const& call() { return spirit::default_wide_encoding::string; }
+        typedef spirit::standard_wide::string_type type; 
+        static type const& call() { return spirit::standard_wide::string; }
     };
 
     template <typename Traits, typename Allocator> 
     struct meta_create_string<std::basic_string<wchar_t, Traits, Allocator> >
     {
-        typedef spirit::default_wide_encoding::string_type type; 
-        static type const& call() { return spirit::default_wide_encoding::string; }
+        typedef spirit::standard_wide::string_type type; 
+        static type const& call() { return spirit::standard_wide::string; }
     };
 
     ///////////////////////////////////////////////////////////////////////////
@@ -203,14 +203,14 @@
     template <> 
     struct meta_create<char> 
     { 
-        typedef spirit::default_encoding::char_type type;
-        static type const& call() { return spirit::default_encoding::char_; }
+        typedef spirit::standard::char_type type;
+        static type const& call() { return spirit::standard::char_; }
     };
     template <> 
     struct meta_create<wchar_t> 
     { 
-        typedef spirit::default_wide_encoding::char_type type;
-        static type const& call() { return spirit::default_wide_encoding::char_; }
+        typedef spirit::standard_wide::char_type type;
+        static type const& call() { return spirit::standard_wide::char_; }
     };
 
     // boolean generator

Modified: trunk/boost/spirit/home/karma/char/char.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/char/char.hpp	(original)
+++ trunk/boost/spirit/home/karma/char/char.hpp	2010-03-08 09:05:04 EST (Mon, 08 Mar 2010)
@@ -354,20 +354,20 @@
     // literals: 'x', "x"
     template <typename Modifiers>
     struct make_primitive<char, Modifiers>
-      : detail::basic_literal<Modifiers, char_encoding::default_encoding> {};
+      : detail::basic_literal<Modifiers, char_encoding::standard> {};
 
     template <typename Modifiers>
     struct make_primitive<char const(&)[2], Modifiers>
-      : detail::basic_literal<Modifiers, char_encoding::default_encoding> {};
+      : detail::basic_literal<Modifiers, char_encoding::standard> {};
 
     // literals: L'x', L"x"
     template <typename Modifiers>
     struct make_primitive<wchar_t, Modifiers>
-      : detail::basic_literal<Modifiers, char_encoding::default_wide_encoding> {};
+      : detail::basic_literal<Modifiers, char_encoding::standard_wide> {};
 
     template <typename Modifiers>
     struct make_primitive<wchar_t const(&)[2], Modifiers>
-      : detail::basic_literal<Modifiers, char_encoding::default_wide_encoding> {};
+      : detail::basic_literal<Modifiers, char_encoding::standard_wide> {};
 
     // char_
     template <typename CharEncoding, typename Modifiers>

Modified: trunk/boost/spirit/home/karma/char/char_class.hpp
==============================================================================
--- trunk/boost/spirit/home/karma/char/char_class.hpp	(original)
+++ trunk/boost/spirit/home/karma/char/char_class.hpp	2010-03-08 09:05:04 EST (Mon, 08 Mar 2010)
@@ -42,8 +42,6 @@
 {
     // hoist the char classification namespaces into karma sub-namespaces of 
     // the same name
-    namespace default_encoding { using namespace boost::spirit::default_encoding; }
-    namespace default_wide_encoding { using namespace boost::spirit::default_wide_encoding; }
     namespace ascii { using namespace boost::spirit::ascii; }
     namespace iso8859_1 { using namespace boost::spirit::iso8859_1; }
     namespace standard { using namespace boost::spirit::standard; }