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

Moved some components into a detail sub-directory

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@489 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2012-07-22 07:03:54 +00:00
parent 435dadf89d
commit bd30f8c492
6 changed files with 97 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

4
turtle/detail/function.hpp
View file

@ -48,12 +48,12 @@
namespace mock
{
template< typename Signature >
bool verify( const function< Signature >& f )
bool verify( const detail::function< Signature >& f )
{
return f.verify();
}
template< typename Signature >
void reset( function< Signature >& f )
void reset( detail::function< Signature >& f )
{
f.reset();
}

3
turtle/detail/function_template.hpp
View file

@ -9,6 +9,8 @@
#include "expectation_template.hpp"
namespace mock
{
namespace detail
{
template< typename Signature > class function;
@ -264,4 +266,5 @@ namespace mock
boost::shared_ptr< function_impl > impl_;
};
}
} // mock

10
turtle/mock.hpp
View file

@ -24,7 +24,7 @@ namespace mock
namespace detail
{
template< typename S >
struct functor : mock::function< S >
struct functor : mock::detail::function< S >
{
functor()
{
@ -54,8 +54,8 @@ namespace detail
t##_mock( mock::detail::root, "?." )
#define MOCK_METHOD_HELPER(S, t) \
mutable mock::function< S > t##_mock_; \
mock::function< S >& t##_mock( \
mutable mock::detail::function< S > t##_mock_; \
mock::detail::function< S >& t##_mock( \
const mock::detail::context&, \
boost::unit_test::const_string instance ) const \
{ \
@ -120,11 +120,11 @@ namespace detail
MOCK_METHOD_HELPER(T(), t)
#define MOCK_FUNCTION_HELPER(S, t, s) \
s mock::function< S >& t##_mock( \
s mock::detail::function< S >& t##_mock( \
mock::detail::context& context, \
boost::unit_test::const_string instance ) \
{ \
static mock::function< S > f; \
static mock::detail::function< S > f; \
return f( context, instance ); \
}