diff options
Diffstat (limited to 'boost/test/utils/iterator/token_iterator.hpp')
-rw-r--r-- | boost/test/utils/iterator/token_iterator.hpp | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/boost/test/utils/iterator/token_iterator.hpp b/boost/test/utils/iterator/token_iterator.hpp index c41f071739..abc530041d 100644 --- a/boost/test/utils/iterator/token_iterator.hpp +++ b/boost/test/utils/iterator/token_iterator.hpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2004-2014. +// (C) Copyright Gennadiy Rozental 2001. // 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) @@ -40,8 +40,8 @@ namespace std{ using ::ispunct; using ::isspace; } #endif namespace boost { - namespace unit_test { +namespace utils { // ************************************************************************** // // ************** ti_delimeter_type ************** // @@ -82,22 +82,21 @@ class delim_policy { typedef basic_cstring<CharT const> cstring; public: // Constructor - explicit delim_policy( ti_delimeter_type t = dt_char, cstring d = cstring() ) - : m_type( t ) + explicit delim_policy( ti_delimeter_type type_ = dt_char, cstring delimeters_ = cstring() ) + : m_type( type_ ) { - set_delimeters( d ); + set_delimeters( delimeters_ ); } - void set_delimeters( ti_delimeter_type t ) { m_type = t; } - template<typename Src> - void set_delimeters( Src d ) + void set_delimeters( ti_delimeter_type type_ ) { m_type = type_; } + void set_delimeters( cstring delimeters_ ) { - nfp::optionally_assign( m_delimeters, d ); + m_delimeters = delimeters_; if( !m_delimeters.is_empty() ) m_type = dt_char; } - + void set_delimeters( nfp::nil ) {} bool operator()( CharT c ) { switch( m_type ) { @@ -210,7 +209,7 @@ protected: if( m.has( keep_empty_tokens ) ) m_keep_empty_tokens = true; - nfp::optionally_assign( m_tokens_left, m, max_tokens ); + nfp::opt_assign( m_tokens_left, m, max_tokens ); } template<typename Iter> @@ -406,8 +405,8 @@ make_range_token_iterator( Iter begin, Iter end, Modifier const& m ) //____________________________________________________________________________// +} // namespace utils } // namespace unit_test - } // namespace boost //____________________________________________________________________________// |