shared_ptr -> std::shared_ptr
This is one of the first commits in a plan to remove all `using namespace std;` lines in the entire codebase as it is considered anti-pattern today.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2001-2008.
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -73,7 +73,7 @@ template<typename ParamType, typename ParamIter>
|
||||
class param_test_case_generator : public test_unit_generator {
|
||||
public:
|
||||
param_test_case_generator( callback1<ParamType> const& test_func,
|
||||
const_string tc_name,
|
||||
const_string tc_name,
|
||||
ParamIter par_begin,
|
||||
ParamIter par_end )
|
||||
: m_test_func( test_func )
|
||||
@@ -110,13 +110,13 @@ struct user_param_tc_method_invoker {
|
||||
typedef void (UserTestCase::*test_method)( ParamType );
|
||||
|
||||
// Constructor
|
||||
user_param_tc_method_invoker( shared_ptr<UserTestCase> inst, test_method test_method )
|
||||
user_param_tc_method_invoker( std::shared_ptr<UserTestCase> inst, test_method test_method )
|
||||
: m_inst( inst ), m_test_method( test_method ) {}
|
||||
|
||||
void operator()( ParamType p ) { ((*m_inst).*m_test_method)( p ); }
|
||||
|
||||
// Data members
|
||||
shared_ptr<UserTestCase> m_inst;
|
||||
std::shared_ptr<UserTestCase> m_inst;
|
||||
test_method m_test_method;
|
||||
};
|
||||
|
||||
@@ -127,7 +127,7 @@ struct user_param_tc_method_invoker {
|
||||
template<typename ParamType, typename ParamIter>
|
||||
inline ut_detail::param_test_case_generator<ParamType,ParamIter>
|
||||
make_test_case( callback1<ParamType> const& test_func,
|
||||
const_string tc_name,
|
||||
const_string tc_name,
|
||||
ParamIter par_begin,
|
||||
ParamIter par_end )
|
||||
{
|
||||
@@ -140,7 +140,7 @@ template<typename ParamType, typename ParamIter>
|
||||
inline ut_detail::param_test_case_generator<
|
||||
BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type,ParamIter>
|
||||
make_test_case( void (*test_func)( ParamType ),
|
||||
const_string tc_name,
|
||||
const_string tc_name,
|
||||
ParamIter par_begin,
|
||||
ParamIter par_end )
|
||||
{
|
||||
@@ -155,13 +155,13 @@ inline ut_detail::param_test_case_generator<
|
||||
BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type,ParamIter>
|
||||
make_test_case( void (UserTestCase::*test_method )( ParamType ),
|
||||
const_string tc_name,
|
||||
boost::shared_ptr<UserTestCase> const& user_test_case,
|
||||
boost::std::shared_ptr<UserTestCase> const& user_test_case,
|
||||
ParamIter par_begin,
|
||||
ParamIter par_end )
|
||||
{
|
||||
typedef BOOST_DEDUCED_TYPENAME remove_const<BOOST_DEDUCED_TYPENAME remove_reference<ParamType>::type>::type param_value_type;
|
||||
return ut_detail::param_test_case_generator<param_value_type,ParamIter>(
|
||||
ut_detail::user_param_tc_method_invoker<UserTestCase,ParamType>( user_test_case, test_method ),
|
||||
return ut_detail::param_test_case_generator<param_value_type,ParamIter>(
|
||||
ut_detail::user_param_tc_method_invoker<UserTestCase,ParamType>( user_test_case, test_method ),
|
||||
tc_name,
|
||||
par_begin,
|
||||
par_end );
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2001-2008.
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <boost/test/utils/basic_cstring/basic_cstring.hpp>
|
||||
|
||||
// Boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
#include <boost/detail/workaround.hpp>
|
||||
|
||||
// STL
|
||||
@@ -46,7 +46,7 @@ class BOOST_TEST_DECL predicate_result {
|
||||
|
||||
public:
|
||||
// Constructor
|
||||
predicate_result( bool pv_ )
|
||||
predicate_result( bool pv_ )
|
||||
: p_predicate_value( pv_ )
|
||||
{}
|
||||
|
||||
@@ -74,7 +74,7 @@ public:
|
||||
|
||||
private:
|
||||
// Data members
|
||||
shared_ptr<wrap_stringstream> m_message;
|
||||
std::shared_ptr<wrap_stringstream> m_message;
|
||||
};
|
||||
|
||||
} // namespace test_tools
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2001-2008.
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -25,7 +25,7 @@
|
||||
#include <boost/test/test_observer.hpp>
|
||||
|
||||
// Boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
#include <boost/mpl/for_each.hpp>
|
||||
#include <boost/mpl/identity.hpp>
|
||||
#include <boost/type.hpp>
|
||||
@@ -70,7 +70,7 @@ public:
|
||||
|
||||
// Public r/w properties
|
||||
readwrite_property<std::string> p_name; // name for this test unit
|
||||
readwrite_property<unsigned> p_timeout; // timeout for the test unit execution
|
||||
readwrite_property<unsigned> p_timeout; // timeout for the test unit execution
|
||||
readwrite_property<counter_t> p_expected_failures; // number of expected failures in this test unit
|
||||
mutable readwrite_property<bool> p_enabled; // enabled status for this unit
|
||||
|
||||
@@ -140,7 +140,7 @@ public:
|
||||
std::size_t size() const { return m_members.size(); }
|
||||
|
||||
protected:
|
||||
friend BOOST_TEST_DECL
|
||||
friend BOOST_TEST_DECL
|
||||
void traverse_test_tree( test_suite const&, test_tree_visitor& );
|
||||
friend class framework_impl;
|
||||
virtual ~test_suite() {}
|
||||
@@ -159,8 +159,8 @@ public:
|
||||
, argc( 0 )
|
||||
, argv( 0 )
|
||||
{}
|
||||
|
||||
// Data members
|
||||
|
||||
// Data members
|
||||
int argc;
|
||||
char** argv;
|
||||
};
|
||||
@@ -236,12 +236,12 @@ template<typename InstanceType,typename UserTestCase>
|
||||
struct user_tc_method_invoker {
|
||||
typedef void (UserTestCase::*TestMethod )();
|
||||
|
||||
user_tc_method_invoker( shared_ptr<InstanceType> inst, TestMethod test_method )
|
||||
user_tc_method_invoker( std::shared_ptr<InstanceType> inst, TestMethod test_method )
|
||||
: m_inst( inst ), m_test_method( test_method ) {}
|
||||
|
||||
void operator()() { ((*m_inst).*m_test_method)(); }
|
||||
|
||||
shared_ptr<InstanceType> m_inst;
|
||||
std::shared_ptr<InstanceType> m_inst;
|
||||
TestMethod m_test_method;
|
||||
};
|
||||
|
||||
@@ -261,9 +261,9 @@ template<typename UserTestCase, typename InstanceType>
|
||||
inline test_case*
|
||||
make_test_case( void (UserTestCase::* test_method )(),
|
||||
const_string tc_name,
|
||||
boost::shared_ptr<InstanceType> user_test_case )
|
||||
boost::std::shared_ptr<InstanceType> user_test_case )
|
||||
{
|
||||
return new test_case( ut_detail::normalize_test_case_name( tc_name ),
|
||||
return new test_case( ut_detail::normalize_test_case_name( tc_name ),
|
||||
ut_detail::user_tc_method_invoker<InstanceType,UserTestCase>( user_test_case, test_method ) );
|
||||
}
|
||||
|
||||
@@ -299,10 +299,10 @@ struct auto_tc_exp_fail {
|
||||
instance() = this;
|
||||
}
|
||||
|
||||
static auto_tc_exp_fail*& instance()
|
||||
static auto_tc_exp_fail*& instance()
|
||||
{
|
||||
static auto_tc_exp_fail inst;
|
||||
static auto_tc_exp_fail* inst_ptr = &inst;
|
||||
static auto_tc_exp_fail inst;
|
||||
static auto_tc_exp_fail* inst_ptr = &inst;
|
||||
|
||||
return inst_ptr;
|
||||
}
|
||||
@@ -322,30 +322,30 @@ private:
|
||||
// ************** global_fixture ************** //
|
||||
// ************************************************************************** //
|
||||
|
||||
class BOOST_TEST_DECL global_fixture : public test_observer {
|
||||
public:
|
||||
class BOOST_TEST_DECL global_fixture : public test_observer {
|
||||
public:
|
||||
// Constructor
|
||||
global_fixture();
|
||||
};
|
||||
};
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
namespace ut_detail {
|
||||
|
||||
template<typename F>
|
||||
template<typename F>
|
||||
struct global_fixture_impl : public global_fixture {
|
||||
// Constructor
|
||||
global_fixture_impl(): m_fixure( 0 ) {}
|
||||
|
||||
// test observer interface
|
||||
virtual void test_start( counter_t ) { m_fixure = new F; }
|
||||
virtual void test_finish() { delete m_fixure; m_fixure = 0; }
|
||||
virtual void test_aborted() { delete m_fixure; m_fixure = 0; }
|
||||
virtual void test_finish() { delete m_fixure; m_fixure = 0; }
|
||||
virtual void test_aborted() { delete m_fixure; m_fixure = 0; }
|
||||
|
||||
private:
|
||||
// Data members
|
||||
F* m_fixure;
|
||||
};
|
||||
};
|
||||
|
||||
// ************************************************************************** //
|
||||
// ************** test_case_template_invoker ************** //
|
||||
@@ -379,7 +379,7 @@ struct generate_test_case_4_type {
|
||||
full_name += " const";
|
||||
full_name += '>';
|
||||
|
||||
m_holder.m_test_cases.push_back(
|
||||
m_holder.m_test_cases.push_back(
|
||||
new test_case( full_name, test_case_template_invoker<TestCaseTemplate,TestType>() ) );
|
||||
}
|
||||
|
||||
@@ -409,7 +409,7 @@ public:
|
||||
{
|
||||
if( m_test_cases.empty() )
|
||||
return 0;
|
||||
|
||||
|
||||
test_unit* res = m_test_cases.front();
|
||||
m_test_cases.pop_front();
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Use, modification, and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// 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)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -9,7 +9,7 @@
|
||||
//
|
||||
// Version : $Revision: 49312 $
|
||||
//
|
||||
// Description :
|
||||
// Description :
|
||||
// ***************************************************************************
|
||||
|
||||
#ifndef BOOST_TEST_CALLBACK_020505GER
|
||||
@@ -18,7 +18,7 @@
|
||||
// Boost
|
||||
#include <boost/config.hpp>
|
||||
#include <boost/detail/workaround.hpp>
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
|
||||
#include <boost/test/detail/suppress_warnings.hpp>
|
||||
|
||||
@@ -109,7 +109,7 @@ public:
|
||||
template<typename Functor>
|
||||
callback0( Functor f )
|
||||
: m_impl( new ut_detail::callback0_impl_t<R,Functor>( f ) ) {}
|
||||
|
||||
|
||||
void operator=( callback0 const& rhs ) { m_impl = rhs.m_impl; }
|
||||
|
||||
template<typename Functor>
|
||||
@@ -121,7 +121,7 @@ public:
|
||||
|
||||
private:
|
||||
// Data members
|
||||
boost::shared_ptr<ut_detail::callback0_impl<R> > m_impl;
|
||||
boost::std::shared_ptr<ut_detail::callback0_impl<R> > m_impl;
|
||||
};
|
||||
|
||||
// ************************************************************************** //
|
||||
@@ -179,7 +179,7 @@ public:
|
||||
|
||||
private:
|
||||
// Data members
|
||||
boost::shared_ptr<ut_detail::callback1_impl<R,T1> > m_impl;
|
||||
boost::std::shared_ptr<ut_detail::callback1_impl<R,T1> > m_impl;
|
||||
};
|
||||
|
||||
// ************************************************************************** //
|
||||
@@ -236,7 +236,7 @@ public:
|
||||
|
||||
private:
|
||||
// Data members
|
||||
boost::shared_ptr<ut_detail::callback2_impl<R,T1,T2> > m_impl;
|
||||
boost::std::shared_ptr<ut_detail::callback2_impl<R,T1,T2> > m_impl;
|
||||
};
|
||||
|
||||
// ************************************************************************** //
|
||||
@@ -294,7 +294,7 @@ public:
|
||||
|
||||
private:
|
||||
// Data members
|
||||
boost::shared_ptr<ut_detail::callback3_impl<R,T1,T2,T3> > m_impl;
|
||||
boost::std::shared_ptr<ut_detail::callback3_impl<R,T1,T2,T3> > m_impl;
|
||||
};
|
||||
|
||||
} // namespace unit_test
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Use, modification, and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// 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)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -40,7 +40,7 @@ template<typename T, typename IdPolicy>
|
||||
class basic_parameter : private base_from_member<IdPolicy>, public typed_parameter<T> {
|
||||
public:
|
||||
// Constructors
|
||||
explicit basic_parameter( cstring n )
|
||||
explicit basic_parameter( cstring n )
|
||||
: base_from_member<IdPolicy>()
|
||||
, typed_parameter<T>( base_from_member<IdPolicy>::member )
|
||||
{
|
||||
@@ -61,16 +61,16 @@ public:
|
||||
|
||||
#define BOOST_RT_CLA_NAMED_PARAM_GENERATORS( param_type ) \
|
||||
template<typename T> \
|
||||
inline shared_ptr<param_type ## _t<T> > \
|
||||
inline std::shared_ptr<param_type ## _t<T> > \
|
||||
param_type( cstring name = cstring() ) \
|
||||
{ \
|
||||
return shared_ptr<param_type ## _t<T> >( new param_type ## _t<T>( name ) ); \
|
||||
return std::shared_ptr<param_type ## _t<T> >( new param_type ## _t<T>( name ) ); \
|
||||
} \
|
||||
\
|
||||
inline shared_ptr<param_type ## _t<cstring> > \
|
||||
inline std::shared_ptr<param_type ## _t<cstring> > \
|
||||
param_type( cstring name = cstring() ) \
|
||||
{ \
|
||||
return shared_ptr<param_type ## _t<cstring> >( new param_type ## _t<cstring>( name ) ); \
|
||||
return std::shared_ptr<param_type ## _t<cstring> >( new param_type ## _t<cstring>( name ) ); \
|
||||
} \
|
||||
/**/
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Use, modification, and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// 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)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -66,18 +66,18 @@ public:
|
||||
//____________________________________________________________________________//
|
||||
|
||||
template<typename T>
|
||||
inline shared_ptr<char_parameter_t<T> >
|
||||
inline std::shared_ptr<char_parameter_t<T> >
|
||||
char_parameter( char_type name )
|
||||
{
|
||||
return shared_ptr<char_parameter_t<T> >( new char_parameter_t<T>( name ) );
|
||||
return std::shared_ptr<char_parameter_t<T> >( new char_parameter_t<T>( name ) );
|
||||
}
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
inline shared_ptr<char_parameter_t<cstring> >
|
||||
inline std::shared_ptr<char_parameter_t<cstring> >
|
||||
char_parameter( char_type name )
|
||||
{
|
||||
return shared_ptr<char_parameter_t<cstring> >( new char_parameter_t<cstring>( name ) );
|
||||
return std::shared_ptr<char_parameter_t<cstring> >( new char_parameter_t<cstring>( name ) );
|
||||
}
|
||||
|
||||
//____________________________________________________________________________//
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Use, modification, and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// 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)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <boost/test/utils/runtime/config.hpp>
|
||||
|
||||
// Boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
|
||||
namespace boost {
|
||||
|
||||
@@ -29,9 +29,9 @@ namespace cla {
|
||||
|
||||
class parser;
|
||||
class parameter;
|
||||
typedef shared_ptr<parameter> parameter_ptr;
|
||||
typedef std::shared_ptr<parameter> parameter_ptr;
|
||||
class naming_policy;
|
||||
typedef shared_ptr<naming_policy> naming_policy_ptr;
|
||||
typedef std::shared_ptr<naming_policy> naming_policy_ptr;
|
||||
class argv_traverser;
|
||||
|
||||
namespace rt_cla_detail {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Use, modification, and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// 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)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -88,12 +88,12 @@ public:
|
||||
bool conflict_with( parameter const& p ) const
|
||||
{
|
||||
return (id_2_report() == p.id_2_report() && !id_2_report().is_empty()) ||
|
||||
m_id_policy.conflict_with( p.m_id_policy ) ||
|
||||
m_id_policy.conflict_with( p.m_id_policy ) ||
|
||||
((m_id_policy.p_type_id != p.m_id_policy.p_type_id) && p.m_id_policy.conflict_with( m_id_policy ));
|
||||
}
|
||||
cstring id_2_report() const { return m_id_policy.id_2_report(); }
|
||||
void usage_info( format_stream& fs ) const
|
||||
{
|
||||
{
|
||||
m_id_policy.usage_info( fs );
|
||||
if( p_optional_value )
|
||||
fs << BOOST_RT_PARAM_LITERAL( '[' );
|
||||
@@ -131,8 +131,8 @@ private:
|
||||
//____________________________________________________________________________//
|
||||
|
||||
template<typename Parameter,typename Modifier>
|
||||
inline shared_ptr<Parameter>
|
||||
operator-( shared_ptr<Parameter> p, Modifier const& m )
|
||||
inline std::shared_ptr<Parameter>
|
||||
operator-( std::shared_ptr<Parameter> p, Modifier const& m )
|
||||
{
|
||||
p->accept_modifier( m );
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Use, modification, and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// 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)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -52,7 +52,7 @@ public:
|
||||
|
||||
template<typename Param>
|
||||
global_mod_parser const&
|
||||
operator<<( shared_ptr<Param> param ) const
|
||||
operator<<( std::shared_ptr<Param> param ) const
|
||||
{
|
||||
param->accept_modifier( m_modifiers );
|
||||
|
||||
@@ -103,7 +103,7 @@ public:
|
||||
|
||||
// arguments access
|
||||
const_argument_ptr operator[]( cstring string_id ) const;
|
||||
cstring get( cstring string_id ) const;
|
||||
cstring get( cstring string_id ) const;
|
||||
|
||||
template<typename T>
|
||||
T const& get( cstring string_id ) const
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Use, modification, and distribution are subject to the
|
||||
// Boost Software License, Version 1.0. (See accompanying file
|
||||
// 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)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -26,7 +26,7 @@
|
||||
#include <boost/test/utils/named_params.hpp>
|
||||
|
||||
// Boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
|
||||
namespace boost {
|
||||
|
||||
@@ -34,7 +34,7 @@ namespace BOOST_RT_PARAM_NAMESPACE {
|
||||
|
||||
namespace file {
|
||||
|
||||
// Public typedef
|
||||
// Public typedef
|
||||
typedef std::pair<dstring,long> location;
|
||||
|
||||
// ************************************************************************** //
|
||||
@@ -154,7 +154,7 @@ private:
|
||||
|
||||
// Data members
|
||||
struct Impl;
|
||||
shared_ptr<Impl> m_pimpl;
|
||||
std::shared_ptr<Impl> m_pimpl;
|
||||
};
|
||||
|
||||
} // namespace file
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <boost/test/utils/runtime/config.hpp>
|
||||
|
||||
// Boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
|
||||
namespace boost {
|
||||
|
||||
@@ -28,8 +28,8 @@ namespace BOOST_RT_PARAM_NAMESPACE {
|
||||
class parameter;
|
||||
|
||||
class argument;
|
||||
typedef shared_ptr<argument> argument_ptr;
|
||||
typedef shared_ptr<argument const> const_argument_ptr;
|
||||
typedef std::shared_ptr<argument> argument_ptr;
|
||||
typedef std::shared_ptr<argument const> const_argument_ptr;
|
||||
|
||||
template<typename T> class value_interpreter;
|
||||
template<typename T> class typed_argument;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
// (C) Copyright Gennadiy Rozental 2005-2008.
|
||||
// Distributed under the Boost Software License, Version 1.0.
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// (See accompanying file LICENSE_1_0.txt or copy at
|
||||
// http://www.boost.org/LICENSE_1_0.txt)
|
||||
|
||||
// See http://www.boost.org/libs/test for the library home page.
|
||||
@@ -22,7 +22,7 @@
|
||||
#include <boost/test/utils/class_properties.hpp>
|
||||
|
||||
// Boost
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#include <boost/std::shared_ptr.hpp>
|
||||
|
||||
// STL
|
||||
#ifdef BOOST_RT_PARAM_EXCEPTION_INHERIT_STD
|
||||
@@ -37,14 +37,14 @@ namespace BOOST_RT_PARAM_NAMESPACE {
|
||||
// ************** runtime::logic_error ************** //
|
||||
// ************************************************************************** //
|
||||
|
||||
class logic_error
|
||||
class logic_error
|
||||
#ifdef BOOST_RT_PARAM_EXCEPTION_INHERIT_STD
|
||||
: public std::exception
|
||||
#endif
|
||||
{
|
||||
typedef shared_ptr<dstring> dstring_ptr;
|
||||
typedef std::shared_ptr<dstring> dstring_ptr;
|
||||
public:
|
||||
// Constructor // !! could we eliminate shared_ptr
|
||||
// Constructor // !! could we eliminate std::shared_ptr
|
||||
explicit logic_error( cstring msg ) : m_msg( new dstring( msg.begin(), msg.size() ) ) {}
|
||||
~logic_error() throw() {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user