diff options
Diffstat (limited to 'boost/spirit/home/x3/char')
| -rw-r--r-- | boost/spirit/home/x3/char/char.hpp | 6 | ||||
| -rw-r--r-- | boost/spirit/home/x3/char/char_class.hpp | 2 | ||||
| -rw-r--r-- | boost/spirit/home/x3/char/char_set.hpp | 2 |
3 files changed, 9 insertions, 1 deletions
diff --git a/boost/spirit/home/x3/char/char.hpp b/boost/spirit/home/x3/char/char.hpp index 5cfd720152..8cd213a2bc 100644 --- a/boost/spirit/home/x3/char/char.hpp +++ b/boost/spirit/home/x3/char/char.hpp @@ -38,6 +38,7 @@ namespace boost { namespace spirit { namespace x3 using standard::char_; using standard::lit; +#ifndef BOOST_SPIRIT_NO_STANDARD_WIDE namespace standard_wide { typedef any_char<char_encoding::standard_wide> char_type; @@ -49,6 +50,7 @@ namespace boost { namespace spirit { namespace x3 return { ch }; } } +#endif namespace ascii { @@ -103,6 +105,7 @@ namespace boost { namespace spirit { namespace x3 } }; +#ifndef BOOST_SPIRIT_NO_STANDARD_WIDE template <> struct as_parser<wchar_t> { @@ -117,6 +120,7 @@ namespace boost { namespace spirit { namespace x3 return { ch }; } }; +#endif template <> struct as_parser<char [2]> @@ -133,6 +137,7 @@ namespace boost { namespace spirit { namespace x3 } }; +#ifndef BOOST_SPIRIT_NO_STANDARD_WIDE template <> struct as_parser<wchar_t [2]> { @@ -147,6 +152,7 @@ namespace boost { namespace spirit { namespace x3 return { ch[0] }; } }; +#endif } diff --git a/boost/spirit/home/x3/char/char_class.hpp b/boost/spirit/home/x3/char/char_class.hpp index 7fae90fdcd..0af6f01d9f 100644 --- a/boost/spirit/home/x3/char/char_class.hpp +++ b/boost/spirit/home/x3/char/char_class.hpp @@ -93,7 +93,9 @@ namespace boost { namespace spirit { namespace x3 /***/ BOOST_SPIRIT_X3_CHAR_CLASSES(standard) +#ifndef BOOST_SPIRIT_NO_STANDARD_WIDE BOOST_SPIRIT_X3_CHAR_CLASSES(standard_wide) +#endif BOOST_SPIRIT_X3_CHAR_CLASSES(ascii) BOOST_SPIRIT_X3_CHAR_CLASSES(iso8859_1) diff --git a/boost/spirit/home/x3/char/char_set.hpp b/boost/spirit/home/x3/char/char_set.hpp index 3a8f986456..1bff83ec6b 100644 --- a/boost/spirit/home/x3/char/char_set.hpp +++ b/boost/spirit/home/x3/char/char_set.hpp @@ -115,7 +115,7 @@ namespace boost { namespace spirit { namespace x3 struct get_info<char_set<Encoding, Attribute>> { typedef std::string result_type; - std::string operator()(char_set<Encoding, Attribute> const& p) const + std::string operator()(char_set<Encoding, Attribute> const& /* p */) const { return "char-set"; } |