Subject: [Boost-commit] svn:boost r60347 - in trunk/boost/spirit/home: qi/auto qi/char qi/string support support/char_encoding
From: joel_at_[hidden]
Date: 2010-03-08 07:51:07
Author: djowel
Date: 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
New Revision: 60347
URL: http://svn.boost.org/trac/boost/changeset/60347
Log:
removing default encodings
Removed:
trunk/boost/spirit/home/support/char_encoding/default_encoding.hpp
trunk/boost/spirit/home/support/char_encoding/default_wide_encoding.hpp
Text files modified:
trunk/boost/spirit/home/qi/auto/meta_create.hpp | 8 ++++----
trunk/boost/spirit/home/qi/char/char.hpp | 8 ++++----
trunk/boost/spirit/home/qi/char/char_class.hpp | 6 ++----
trunk/boost/spirit/home/qi/string/lit.hpp | 2 +-
trunk/boost/spirit/home/qi/string/symbols.hpp | 2 +-
trunk/boost/spirit/home/support/common_terminals.hpp | 4 ----
6 files changed, 12 insertions(+), 18 deletions(-)
Modified: trunk/boost/spirit/home/qi/auto/meta_create.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/auto/meta_create.hpp (original)
+++ trunk/boost/spirit/home/qi/auto/meta_create.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
@@ -135,14 +135,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/qi/char/char.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/char/char.hpp (original)
+++ trunk/boost/spirit/home/qi/char/char.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
@@ -424,19 +424,19 @@
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> {};
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> {};
template <typename CharEncoding, typename Modifiers>
struct make_primitive<
Modified: trunk/boost/spirit/home/qi/char/char_class.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/char/char_class.hpp (original)
+++ trunk/boost/spirit/home/qi/char/char_class.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
@@ -35,8 +35,6 @@
{
// hoist the char classification namespaces into qi 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; }
@@ -45,10 +43,10 @@
namespace unicode { using namespace boost::spirit::unicode; }
#endif
- // Import the default_encoding namespace into the qi namespace. This allows
+ // Import the standard namespace into the qi namespace. This allows
// for default handling of all character/string related operations if not
// prefixed with a character set namespace.
- using namespace boost::spirit::default_encoding;
+ using namespace boost::spirit::standard;
// Import encoding
using spirit::encoding;
Modified: trunk/boost/spirit/home/qi/string/lit.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/string/lit.hpp (original)
+++ trunk/boost/spirit/home/qi/string/lit.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
@@ -196,7 +196,7 @@
result_type op(String const& str, mpl::true_) const
{
typename spirit::detail::get_encoding<Modifiers,
- spirit::char_encoding::default_encoding>::type encoding;
+ spirit::char_encoding::standard>::type encoding;
return result_type(traits::get_c_string(str), encoding);
}
};
Modified: trunk/boost/spirit/home/qi/string/symbols.hpp
==============================================================================
--- trunk/boost/spirit/home/qi/string/symbols.hpp (original)
+++ trunk/boost/spirit/home/qi/string/symbols.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
@@ -363,7 +363,7 @@
typedef no_case_filter<
typename spirit::detail::get_encoding_with_case<
Modifiers
- , char_encoding::default_encoding
+ , char_encoding::standard
, no_case::value>::type>
nc_filter;
Deleted: trunk/boost/spirit/home/support/char_encoding/default_encoding.hpp
==============================================================================
--- trunk/boost/spirit/home/support/char_encoding/default_encoding.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
+++ (empty file)
@@ -1,28 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2010 Hartmut Kaiser
- Copyright (c) 2001-2010 Joel de Guzman
-
- Distributed under the Boost Software License, Version 1.0. (See accompanying
- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-=============================================================================*/
-#if !defined(BOOST_SPIRIT_DEFAULT_ENCODING_MARCH_05_2010_1041AM)
-#define BOOST_SPIRIT_DEFAULT_ENCODING_MARCH_05_2010_1041AM
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#include <boost/spirit/home/support/char_encoding/standard.hpp>
-
-namespace boost { namespace spirit { namespace char_encoding
-{
- ///////////////////////////////////////////////////////////////////////////
- // default_encoding uses char_encoding::standard
- ///////////////////////////////////////////////////////////////////////////
- struct default_encoding : char_encoding::standard
- {
- };
-}}}
-
-#endif
-
Deleted: trunk/boost/spirit/home/support/char_encoding/default_wide_encoding.hpp
==============================================================================
--- trunk/boost/spirit/home/support/char_encoding/default_wide_encoding.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
+++ (empty file)
@@ -1,28 +0,0 @@
-/*=============================================================================
- Copyright (c) 2001-2010 Hartmut Kaiser
- Copyright (c) 2001-2010 Joel de Guzman
-
- Distributed under the Boost Software License, Version 1.0. (See accompanying
- file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-=============================================================================*/
-#if !defined(BOOST_SPIRIT_DEFAULT_WIDE_ENCODING_MARCH_05_2010_1041AM)
-#define BOOST_SPIRIT_DEFAULT_WIDE_ENCODING_MARCH_05_2010_1041AM
-
-#if defined(_MSC_VER)
-#pragma once
-#endif
-
-#include <boost/spirit/home/support/char_encoding/standard_wide.hpp>
-
-namespace boost { namespace spirit { namespace char_encoding
-{
- ///////////////////////////////////////////////////////////////////////////
- // default_wide_encoding uses char_encoding::standard
- ///////////////////////////////////////////////////////////////////////////
- struct default_wide_encoding : char_encoding::standard_wide
- {
- };
-}}}
-
-#endif
-
Modified: trunk/boost/spirit/home/support/common_terminals.hpp
==============================================================================
--- trunk/boost/spirit/home/support/common_terminals.hpp (original)
+++ trunk/boost/spirit/home/support/common_terminals.hpp 2010-03-08 07:51:06 EST (Mon, 08 Mar 2010)
@@ -13,8 +13,6 @@
#endif
#include <boost/spirit/home/support/terminal.hpp>
-#include <boost/spirit/home/support/char_encoding/default_encoding.hpp>
-#include <boost/spirit/home/support/char_encoding/default_wide_encoding.hpp>
#include <boost/spirit/home/support/char_encoding/standard.hpp>
#include <boost/spirit/home/support/char_encoding/standard_wide.hpp>
#include <boost/spirit/home/support/char_encoding/ascii.hpp>
@@ -199,8 +197,6 @@
}}} \
/***/
-BOOST_SPIRIT_DEFINE_CHAR_CODES(default_encoding)
-BOOST_SPIRIT_DEFINE_CHAR_CODES(default_wide_encoding)
BOOST_SPIRIT_DEFINE_CHAR_CODES(ascii)
BOOST_SPIRIT_DEFINE_CHAR_CODES(iso8859_1)
BOOST_SPIRIT_DEFINE_CHAR_CODES(standard)