Subject: [Boost-commit] svn:boost r85906 - in trunk/boost/spirit/home: classic/core/non_terminal/impl classic/dynamic/impl classic/meta/impl classic/phoenix classic/utility/impl lex/lexer/lexertl support/detail/lexer
From: steveire_at_[hidden]
Date: 2013-09-25 09:53:02
Author: skelly
Date: 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013)
New Revision: 85906
URL: http://svn.boost.org/trac/boost/changeset/85906
Log:
Spirit: Remove obsolete MSVC version checks
Text files modified:
trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp | 17 ----
trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp | 7 --
trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp | 132 ----------------------------------------
trunk/boost/spirit/home/classic/phoenix/tuples.hpp | 4 -
trunk/boost/spirit/home/classic/utility/impl/chset.ipp | 44 -------------
trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp | 74 ----------------------
trunk/boost/spirit/home/lex/lexer/lexertl/position_token.hpp | 4 -
trunk/boost/spirit/home/lex/lexer/lexertl/token.hpp | 4 -
trunk/boost/spirit/home/support/detail/lexer/debug.hpp | 4 -
trunk/boost/spirit/home/support/detail/lexer/file_input.hpp | 8 --
trunk/boost/spirit/home/support/detail/lexer/generate_re2c.hpp | 4 -
trunk/boost/spirit/home/support/detail/lexer/input.hpp | 8 --
trunk/boost/spirit/home/support/detail/lexer/size_t.hpp | 8 --
trunk/boost/spirit/home/support/detail/lexer/state_machine.hpp | 8 --
trunk/boost/spirit/home/support/detail/lexer/string_token.hpp | 10 --
15 files changed, 2 insertions(+), 334 deletions(-)
Modified: trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/classic/core/non_terminal/impl/grammar.ipp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -33,19 +33,6 @@
template <typename DerivedT, typename ContextT>
struct grammar;
-#if defined(BOOST_MSVC) && (BOOST_MSVC < 1300)
-
-BOOST_SPIRIT_DEPENDENT_TEMPLATE_WRAPPER(grammar_definition_wrapper, definition);
-
-//////////////////////////////////
-template <typename GrammarT, typename ScannerT>
-struct grammar_definition
-{
- typedef typename impl::grammar_definition_wrapper<GrammarT>
- ::template result_<ScannerT>::param_t type;
-};
-
-#else
//////////////////////////////////
template <typename GrammarT, typename ScannerT>
@@ -54,7 +41,6 @@
typedef typename GrammarT::template definition<ScannerT> type;
};
-#endif
namespace impl
{
@@ -316,8 +302,7 @@
self->helpers;
# endif
-# if (defined(BOOST_MSVC) && (BOOST_MSVC < 1300)) \
- || defined(BOOST_INTEL_CXX_VERSION)
+# if defined(BOOST_INTEL_CXX_VERSION)
for (iterator_t i = helpers.rbegin(); i != helpers.rend(); ++i)
(*i)->undefine(self);
# else
Modified: trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/classic/dynamic/impl/conditions.ipp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -36,13 +36,6 @@
typedef typename T::embed_t type;
};
-#if defined(BOOST_MSVC) && BOOST_MSVC <= 1300
- template <> struct embed_t_accessor<int>
- {
- typedef int type;
- };
-#endif
-
template <typename ConditionT>
struct condition_parser_selector
{
Modified: trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/classic/meta/impl/fundamental.ipp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -15,10 +15,6 @@
BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
- BOOST_SPIRIT_DEPENDENT_TEMPLATE_WRAPPER2(count_wrapper, count);
-#endif // defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
-
namespace impl
{
///////////////////////////////////////////////////////////////////////////
@@ -42,68 +38,6 @@
};
};
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
-
- template <>
- struct nodes<unary_parser_category> {
-
- template <typename ParserT, typename LeafCountT>
- struct count {
-
- typedef typename ParserT::subject_t subject_t;
- typedef typename subject_t::parser_category_t subject_category_t;
-
- typedef nodes<subject_category_t> nodes_t;
- typedef typename count_wrapper<nodes_t>
- ::template result_<subject_t, LeafCountT> count_t;
-
- BOOST_STATIC_CONSTANT(int, value = count_t::value + 1);
- };
- };
-
- template <>
- struct nodes<action_parser_category> {
-
- template <typename ParserT, typename LeafCountT>
- struct count {
-
- typedef typename ParserT::subject_t subject_t;
- typedef typename subject_t::parser_category_t subject_category_t;
-
- typedef nodes<subject_category_t> nodes_t;
- typedef typename count_wrapper<nodes_t>
- ::template result_<subject_t, LeafCountT> count_t;
-
- BOOST_STATIC_CONSTANT(int, value = count_t::value + 1);
- };
- };
-
- template <>
- struct nodes<binary_parser_category> {
-
- template <typename ParserT, typename LeafCountT>
- struct count {
-
- typedef typename ParserT::left_t left_t;
- typedef typename ParserT::right_t right_t;
- typedef typename left_t::parser_category_t left_category_t;
- typedef typename right_t::parser_category_t right_category_t;
-
- typedef nodes<left_category_t> left_nodes_t;
- typedef typename count_wrapper<left_nodes_t>
- ::template result_<left_t, LeafCountT> left_count_t;
-
- typedef nodes<right_category_t> right_nodes_t;
- typedef typename count_wrapper<right_nodes_t>
- ::template result_<right_t, LeafCountT> right_count_t;
-
- BOOST_STATIC_CONSTANT(int,
- value = (left_count_t::value + right_count_t::value + 1));
- };
- };
-
-#else
-
template <>
struct nodes<unary_parser_category> {
@@ -158,8 +92,6 @@
};
};
-#endif
-
///////////////////////////////////////////////////////////////////////////
//
// Helper template for counting the number of leaf nodes contained in a
@@ -181,68 +113,6 @@
};
};
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
-
- template <>
- struct leafs<unary_parser_category> {
-
- template <typename ParserT, typename LeafCountT>
- struct count {
-
- typedef typename ParserT::subject_t subject_t;
- typedef typename subject_t::parser_category_t subject_category_t;
-
- typedef leafs<subject_category_t> nodes_t;
- typedef typename count_wrapper<nodes_t>
- ::template result_<subject_t, LeafCountT> count_t;
-
- BOOST_STATIC_CONSTANT(int, value = count_t::value);
- };
- };
-
- template <>
- struct leafs<action_parser_category> {
-
- template <typename ParserT, typename LeafCountT>
- struct count {
-
- typedef typename ParserT::subject_t subject_t;
- typedef typename subject_t::parser_category_t subject_category_t;
-
- typedef leafs<subject_category_t> nodes_t;
- typedef typename count_wrapper<nodes_t>
- ::template result_<subject_t, LeafCountT> count_t;
-
- BOOST_STATIC_CONSTANT(int, value = count_t::value);
- };
- };
-
- template <>
- struct leafs<binary_parser_category> {
-
- template <typename ParserT, typename LeafCountT>
- struct count {
-
- typedef typename ParserT::left_t left_t;
- typedef typename ParserT::right_t right_t;
- typedef typename left_t::parser_category_t left_category_t;
- typedef typename right_t::parser_category_t right_category_t;
-
- typedef leafs<left_category_t> left_nodes_t;
- typedef typename count_wrapper<left_nodes_t>
- ::template result_<left_t, LeafCountT> left_count_t;
-
- typedef leafs<right_category_t> right_nodes_t;
- typedef typename count_wrapper<right_nodes_t>
- ::template result_<right_t, LeafCountT> right_count_t;
-
- BOOST_STATIC_CONSTANT(int,
- value = (left_count_t::value + right_count_t::value));
- };
- };
-
-#else
-
template <>
struct leafs<unary_parser_category> {
@@ -297,8 +167,6 @@
};
};
-#endif
-
} // namespace impl
///////////////////////////////////////////////////////////////////////////////
Modified: trunk/boost/spirit/home/classic/phoenix/tuples.hpp
==============================================================================
--- trunk/boost/spirit/home/classic/phoenix/tuples.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/classic/phoenix/tuples.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -8,10 +8,6 @@
#ifndef PHOENIX_TUPLES_HPP
#define PHOENIX_TUPLES_HPP
-#if defined(BOOST_MSVC) && (BOOST_MSVC <= 1300)
-#error "Sorry, Phoenix does not support VC6 and VC7. Please upgrade to at least VC7.1"
-#endif
-
///////////////////////////////////////////////////////////////////////////////
//
// Phoenix predefined maximum limit. This limit defines the maximum
Modified: trunk/boost/spirit/home/classic/utility/impl/chset.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset.ipp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/classic/utility/impl/chset.ipp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -71,38 +71,6 @@
}
}
- //////////////////////////////////
-
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
- template <typename CharT, typename FakeT>
- void chset_negated_set(boost::shared_ptr<basic_chset<CharT> > &ptr, chlit<CharT> const &ch,
- FakeT)
- {
- if(ch.ch != (std::numeric_limits<CharT>::min)()) {
- ptr->set((std::numeric_limits<CharT>::min)(), ch.ch - 1);
- }
- if(ch.ch != (std::numeric_limits<CharT>::max)()) {
- ptr->set(ch.ch + 1, (std::numeric_limits<CharT>::max)());
- }
- }
-
- template <typename CharT, typename FakeT>
- void chset_negated_set(boost::shared_ptr<basic_chset<CharT> > &ptr,
- spirit::range<CharT> const &rng, FakeT)
- {
- if(rng.first != (std::numeric_limits<CharT>::min)()) {
- ptr->set((std::numeric_limits<CharT>::min)(), rng.first - 1);
- }
- if(rng.last != (std::numeric_limits<CharT>::max)()) {
- ptr->set(rng.last + 1, (std::numeric_limits<CharT>::max)());
- }
- }
-
-#endif // BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
-//////////////////////////////////
-
}} // namespace utility::impl
template <typename CharT>
@@ -142,8 +110,6 @@
: ptr(new basic_chset<CharT>())
{ ptr->set(arg_.first, arg_.last); }
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
template <typename CharT>
inline chset<CharT>::chset(negated_char_parser<chlit<CharT> > const& arg_)
: ptr(new basic_chset<CharT>())
@@ -158,8 +124,6 @@
set(arg_);
}
-#endif // !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
template <typename CharT>
inline chset<CharT>::~chset() {}
@@ -218,8 +182,6 @@
return *this;
}
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
template <typename CharT>
inline chset<CharT>&
chset<CharT>::operator=(negated_char_parser<chlit<CharT> > const& rhs)
@@ -238,8 +200,6 @@
return *this;
}
-#endif // !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
template <typename CharT>
inline void
chset<CharT>::set(range<CharT> const& arg_)
@@ -248,8 +208,6 @@
ptr->set(arg_.first, arg_.last);
}
-#if !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
template <typename CharT>
inline void
chset<CharT>::set(negated_char_parser<chlit<CharT> > const& arg_)
@@ -278,8 +236,6 @@
}
}
-#endif // !BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
template <typename CharT>
inline void
chset<CharT>::clear(range<CharT> const& arg_)
Modified: trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp
==============================================================================
--- trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/classic/utility/impl/chset_operators.ipp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -285,78 +285,6 @@
return chset<CharT>(a.ch) ^ b;
}
-#if BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
-///////////////////////////////////////////////////////////////////////////////
-//
-// negated_char_parser <--> chset free operators implementation
-//
-///////////////////////////////////////////////////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator|(chset<CharT> const& a, negated_char_parser<ParserT> const& b)
-{
- return a | chset<CharT>(b);
-}
-
-//////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator&(chset<CharT> const& a, negated_char_parser<ParserT> const& b)
-{
- return a & chset<CharT>(b);
-}
-
-//////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator-(chset<CharT> const& a, negated_char_parser<ParserT> const& b)
-{
- return a - chset<CharT>(b);
-}
-
-//////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator^(chset<CharT> const& a, negated_char_parser<ParserT> const& b)
-{
- return a ^ chset<CharT>(b);
-}
-
-//////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator|(negated_char_parser<ParserT> const& a, chset<CharT> const& b)
-{
- return chset<CharT>(a) | b;
-}
-
-//////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator&(negated_char_parser<ParserT> const& a, chset<CharT> const& b)
-{
- return chset<CharT>(a) & b;
-}
-
-//////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator-(negated_char_parser<ParserT> const& a, chset<CharT> const& b)
-{
- return chset<CharT>(a) - b;
-}
-
-//////////////////////////////////
-template <typename CharT, typename ParserT>
-inline chset<CharT>
-operator^(negated_char_parser<ParserT> const& a, chset<CharT> const& b)
-{
- return chset<CharT>(a) ^ b;
-}
-
-#else // BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
///////////////////////////////////////////////////////////////////////////////
//
// negated_char_parser<range> <--> chset free operators implementation
@@ -493,8 +421,6 @@
return chset<CharT>(a) ^ b;
}
-#endif // BOOST_WORKAROUND(BOOST_MSVC, < 1300)
-
///////////////////////////////////////////////////////////////////////////////
//
// anychar_parser <--> chset free operators
Modified: trunk/boost/spirit/home/lex/lexer/lexertl/position_token.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/position_token.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/position_token.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -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>
@@ -529,10 +527,8 @@
: 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;
Modified: trunk/boost/spirit/home/lex/lexer/lexertl/token.hpp
==============================================================================
--- trunk/boost/spirit/home/lex/lexer/lexertl/token.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/lex/lexer/lexertl/token.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -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>
@@ -330,10 +328,8 @@
struct token : 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 token<Iterator, lex::omit, HasState, Idtype> base_type;
protected:
Modified: trunk/boost/spirit/home/support/detail/lexer/debug.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/debug.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/support/detail/lexer/debug.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -31,11 +31,7 @@
const CharT *ptr_ = in_.c_str ();
std::size_t size_ = in_.size ();
-#if defined _MSC_VER && _MSC_VER <= 1200
- out_.erase ();
-#else
out_.clear ();
-#endif
while (size_)
{
Modified: trunk/boost/spirit/home/support/detail/lexer/file_input.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/file_input.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/support/detail/lexer/file_input.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -24,11 +24,7 @@
class iterator
{
public:
-#if defined _MSC_VER && _MSC_VER <= 1200
- friend basic_file_input;
-#else
friend class basic_file_input;
-#endif
struct data
{
@@ -132,11 +128,7 @@
data _data;
};
-#if defined _MSC_VER && _MSC_VER <= 1200
- friend iterator;
-#else
friend class iterator;
-#endif
// Make it explict that we are NOT taking a copy of state_machine_!
basic_file_input (const basic_state_machine<CharT> *state_machine_,
Modified: trunk/boost/spirit/home/support/detail/lexer/generate_re2c.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/generate_re2c.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/support/detail/lexer/generate_re2c.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -331,11 +331,7 @@
string_token::escape_char (start_char_, temp_);
os_ << "(ch_ >= '" << temp_;
-#if defined _MSC_VER && _MSC_VER <= 1200
- temp_.erase ();
-#else
temp_.clear ();
-#endif
string_token::escape_char (curr_char_, temp_);
os_ << "' && ch_ <= '" << temp_ << "')";
range_ = false;
Modified: trunk/boost/spirit/home/support/detail/lexer/input.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/input.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/support/detail/lexer/input.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -23,11 +23,7 @@
class iterator
{
public:
-#if defined _MSC_VER && _MSC_VER <= 1200
- friend basic_input;
-#else
friend class basic_input;
-#endif
struct data
{
@@ -481,11 +477,7 @@
}
};
-#if defined _MSC_VER && _MSC_VER <= 1200
- friend iterator;
-#else
friend class iterator;
-#endif
// Make it explict that we are NOT taking a copy of state_machine_!
basic_input (const basic_state_machine<typename Traits::char_type>
Modified: trunk/boost/spirit/home/support/detail/lexer/size_t.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/size_t.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/support/detail/lexer/size_t.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -8,14 +8,6 @@
#include <stddef.h> // ptrdiff_t
-#if defined _MSC_VER && _MSC_VER <= 1200
-namespace std
-{
- using ::ptrdiff_t;
- using ::size_t;
-}
-#else
#include <string>
-#endif
#endif
Modified: trunk/boost/spirit/home/support/detail/lexer/state_machine.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/state_machine.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/support/detail/lexer/state_machine.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -29,11 +29,7 @@
class iterator
{
public:
-#if defined _MSC_VER && _MSC_VER <= 1200
- friend basic_state_machine;
-#else
friend class basic_state_machine;
-#endif
struct data
{
@@ -225,11 +221,7 @@
}
};
-#if defined _MSC_VER && _MSC_VER <= 1200
- friend iterator;
-#else
friend class iterator;
-#endif
basic_state_machine ()
{
Modified: trunk/boost/spirit/home/support/detail/lexer/string_token.hpp
==============================================================================
--- trunk/boost/spirit/home/support/detail/lexer/string_token.hpp Wed Sep 25 09:52:11 2013 (r85905)
+++ trunk/boost/spirit/home/support/detail/lexer/string_token.hpp 2013-09-25 09:53:02 EDT (Wed, 25 Sep 2013) (r85906)
@@ -56,11 +56,7 @@
if (_charset.length () == max_chars_)
{
_negated = !_negated;
-#if defined _MSC_VER && _MSC_VER <= 1200
- _charset.erase ();
-#else
_charset.clear ();
-#endif
}
else if (_charset.length () > max_chars_ / 2)
{
@@ -127,11 +123,7 @@
void clear ()
{
_negated = false;
-#if defined _MSC_VER && _MSC_VER <= 1200
- _charset.erase ();
-#else
- _charset.clear ();
-#endif
+ _charset.clear ();
}
void intersect (basic_string_token &rhs_, basic_string_token &overlap_)