mirrors/turtle
3
0
Fork 0
mirror of https://github.com/mat007/turtle.git synced 2026-06-22 12:13:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replaced new with boost::make_shared

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@634 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2013-05-03 20:16:50 +00:00
parent 26540da771
commit 4ee2837dcd
7 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
turtle/detail/expectation_template.hpp
View file

@ -11,10 +11,12 @@
#define MOCK_EXPECTATION_INITIALIZE(z, n, d) \
BOOST_PP_COMMA_IF(n) c##n##_( \
new matcher< arg##n##_type, constraint< any > >( mock::any ) )
boost::make_shared< \
matcher< arg##n##_type, constraint< any > > >( mock::any ) )
#define MOCK_EXPECTATION_WITH(z, n, d) \
c##n##_.reset( new matcher< arg##n##_type, Constraint_##n >( c##n ) );
c##n##_ = boost::make_shared< \
matcher< arg##n##_type, Constraint_##n > >( c##n );
#define MOCK_EXPECTATION_MEMBER(z, n, d) \
boost::shared_ptr< matcher_base< arg##n##_type > > c##n##_;
@ -73,32 +75,32 @@ namespace detail
}
expectation& once()
{
expect( new detail::once() );
i_ = boost::make_shared< detail::once >();
return *this;
}
expectation& never()
{
expect( new detail::never() );
i_ = boost::make_shared< detail::never >();
return *this;
}
expectation& exactly( std::size_t count )
{
expect( new detail::exactly( count ) );
i_ = boost::make_shared< detail::exactly >( count );
return *this;
}
expectation& at_least( std::size_t min )
{
expect( new detail::at_least( min ) );
i_ = boost::make_shared< detail::exactly >( min );
return *this;
}
expectation& at_most( std::size_t max )
{
expect( new detail::at_most( max ) );
i_ = boost::make_shared< detail::exactly >( max );
return *this;
}
expectation& between( std::size_t min, std::size_t max )
{
expect( new detail::between( min, max ) );
i_ = boost::make_shared< detail::between >( min, max );
return *this;
}
@ -116,7 +118,8 @@ namespace detail
;
}
private:
BOOST_PP_REPEAT(MOCK_NUM_ARGS, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY)
BOOST_PP_REPEAT(
MOCK_NUM_ARGS, MOCK_EXPECTATION_MEMBER, BOOST_PP_EMPTY)
};
}
} // mock