diff options
Diffstat (limited to 'boost/spirit/home/lex/lexer/lexertl/position_token.hpp')
| -rw-r--r-- | boost/spirit/home/lex/lexer/lexertl/position_token.hpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/boost/spirit/home/lex/lexer/lexertl/position_token.hpp b/boost/spirit/home/lex/lexer/lexertl/position_token.hpp index 025cf55d6a..7bf13db12f 100644 --- a/boost/spirit/home/lex/lexer/lexertl/position_token.hpp +++ b/boost/spirit/home/lex/lexer/lexertl/position_token.hpp @@ -35,9 +35,7 @@ #include <boost/mpl/or.hpp> #include <boost/type_traits/is_same.hpp> #include <boost/range/iterator_range.hpp> -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) #include <boost/static_assert.hpp> -#endif #if defined(BOOST_SPIRIT_DEBUG) #include <iosfwd> @@ -387,7 +385,7 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl token_value_type& value() { return value_; } token_value_type const& value() const { return value_; } - bool has_value() const { return value_; } + bool has_value() const { return !!value_; } #if BOOST_WORKAROUND(BOOST_MSVC, == 1600) // workaround for MSVC10 which has problems copying a default @@ -529,15 +527,13 @@ namespace boost { namespace spirit { namespace lex { namespace lexertl : position_token<Iterator, lex::omit, HasState, Idtype> { private: // precondition assertions -#if !BOOST_WORKAROUND(BOOST_MSVC, <= 1300) BOOST_STATIC_ASSERT((mpl::is_sequence<AttributeTypes>::value || is_same<AttributeTypes, lex::omit>::value)); -#endif typedef position_token<Iterator, lex::omit, HasState, Idtype> base_type; protected: - // If no additional token value types are given, the the token will + // If no additional token value types are given, the token will // hold no token value at all as the base class already has the // iterator pair of the matched range in the underlying input sequence. // Otherwise the token value is stored as a variant and will |