diff options
Diffstat (limited to 'boost/test/utils/runtime/file/config_file.cpp')
| -rw-r--r-- | boost/test/utils/runtime/file/config_file.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/boost/test/utils/runtime/file/config_file.cpp b/boost/test/utils/runtime/file/config_file.cpp index d369d79504..1e13d66eee 100644 --- a/boost/test/utils/runtime/file/config_file.cpp +++ b/boost/test/utils/runtime/file/config_file.cpp @@ -1,4 +1,4 @@ -// (C) Copyright Gennadiy Rozental 2005-2008. +// (C) Copyright Gennadiy Rozental 2005-2014. // Use, modification, and distribution are subject to 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) @@ -26,7 +26,7 @@ namespace boost { -namespace BOOST_RT_PARAM_NAMESPACE { +namespace BOOST_TEST_UTILS_RUNTIME_PARAM_NAMESPACE { namespace file { @@ -60,7 +60,7 @@ operator<<( std::ostream& os, parameter const& p ) param_namespace::param_namespace( cstring name, param_namespace const* parent ) : p_parent( parent ) { - assign_op( p_name.value, name ); + assign_op( p_name.value, name, 0 ); } //____________________________________________________________________________// @@ -69,8 +69,8 @@ void param_namespace::insert_param( cstring param_name, cstring param_value ) { BOOST_TEST_FOREACH( parameter const&, p, m_parameters ) - BOOST_RT_PARAM_VALIDATE_LOGIC( p.p_name != param_name, - BOOST_RT_PARAM_LITERAL( "Duplicate parameter " ) << param_name ); + BOOST_TEST_UTILS_RUNTIME_PARAM_VALIDATE_LOGIC( p.p_name != param_name, + BOOST_TEST_UTILS_RUNTIME_PARAM_LITERAL( "Duplicate parameter " ) << param_name ); m_parameters.push_back( parameter( param_name, param_value, *this ) ); } @@ -133,7 +133,7 @@ get_param_value( param_namespace const& where_from, return res; } - + param_namespace const* sns = get_param_subns( where_from, name_part1 ); return sns ? get_param_value( *sns, name_part2, name_part3, name_part4, name_part5 ) @@ -153,13 +153,13 @@ get_requ_param_value( param_namespace const& where_from, boost::optional<cstring> v = get_param_value( where_from, name_part1, name_part2, name_part3, name_part4, name_part5 ); #define APPEND_PART( part ) (part.is_empty() ? "" : "::") << (part.is_empty() ? cstring() : part) - BOOST_RT_PARAM_VALIDATE_LOGIC( !!v, BOOST_RT_PARAM_LITERAL( "Required parameter " ) - << name_part1 + BOOST_TEST_UTILS_RUNTIME_PARAM_VALIDATE_LOGIC( !!v, BOOST_TEST_UTILS_RUNTIME_PARAM_LITERAL( "Required parameter " ) + << name_part1 << APPEND_PART( name_part2 ) << APPEND_PART( name_part3 ) << APPEND_PART( name_part4 ) << APPEND_PART( name_part5 ) - << BOOST_RT_PARAM_LITERAL( " value is missing" ) ); + << BOOST_TEST_UTILS_RUNTIME_PARAM_LITERAL( " value is missing" ) ); #undef APPEND_PART return *v; @@ -186,7 +186,7 @@ get_param_subns( param_namespace const& where_from, cstring namespace_name ) //____________________________________________________________________________// void -param_namespace::load_impl( config_file_iterator cf_it, +param_namespace::load_impl( config_file_iterator cf_it, cstring value_marker, cstring value_delimeter, cstring namespace_delimeter ) { using namespace unit_test; @@ -242,7 +242,7 @@ config_file::config_file( cstring file_name ) } // namespace file -} // namespace BOOST_RT_PARAM_NAMESPACE +} // namespace BOOST_TEST_UTILS_RUNTIME_PARAM_NAMESPACE } // namespace boost |