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

Cleanup

Browse source 
git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@209 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-01-28 14:26:58 +00:00
parent 9324f8f033
commit 771d1ef783
3 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libraries/turtle/constraint.hpp
View file

@ -6,8 +6,8 @@
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// //
#ifndef MOCK_PLACEHOLDER_HPP_INCLUDED #ifndef MOCK_CONSTRAINT_HPP_INCLUDED
#define MOCK_PLACEHOLDER_HPP_INCLUDED #define MOCK_CONSTRAINT_HPP_INCLUDED
namespace mock namespace mock
{ {
@ -21,4 +21,4 @@ namespace mock
}; };
} }
#endif // #ifndef MOCK_PLACEHOLDER_HPP_INCLUDED #endif // #ifndef MOCK_CONSTRAINT_HPP_INCLUDED

20
src/libraries/turtle/constraints.hpp
View file

@ -29,7 +29,7 @@ namespace mock
} \ } \
friend std::ostream& operator<<( std::ostream& s, const N& ) \ friend std::ostream& operator<<( std::ostream& s, const N& ) \
{ \ { \
return s << BOOST_STRINGIZE( N ); \ return s << BOOST_STRINGIZE(N); \
} \ } \
}; \ }; \
} \ } \
@ -42,9 +42,9 @@ namespace mock
}; \ }; \
const constraint< detail::N > N; const constraint< detail::N > N;
MOCK_CONSTRAINT( any, true && &actual ) MOCK_CONSTRAINT(any, true && &actual)
MOCK_CONSTRAINT( negate, ! actual ) MOCK_CONSTRAINT(negate, ! actual)
MOCK_CONSTRAINT( evaluate, actual() ) MOCK_CONSTRAINT(evaluate, actual())
#undef MOCK_CONSTRAINT #undef MOCK_CONSTRAINT
@ -64,7 +64,7 @@ namespace mock
} \ } \
friend std::ostream& operator<<( std::ostream& s, const N& n ) \ friend std::ostream& operator<<( std::ostream& s, const N& n ) \
{ \ { \
return s << BOOST_STRINGIZE( N ) << "( " << mock::format( n.expected_ ) << " )"; \ return s << BOOST_STRINGIZE(N) << "( " << mock::format( n.expected_ ) << " )"; \
} \ } \
Expected expected_; \ Expected expected_; \
}; \ }; \
@ -75,11 +75,11 @@ namespace mock
return detail::N< T >( t ); \ return detail::N< T >( t ); \
} }
MOCK_CONSTRAINT( equal, actual == expected_ ) MOCK_CONSTRAINT(equal, actual == expected_)
MOCK_CONSTRAINT( less, actual < expected_ ) MOCK_CONSTRAINT(less, actual < expected_)
MOCK_CONSTRAINT( greater, actual > expected_ ) MOCK_CONSTRAINT(greater, actual > expected_)
MOCK_CONSTRAINT( less_equal, actual <= expected_ ) MOCK_CONSTRAINT(less_equal, actual <= expected_)
MOCK_CONSTRAINT( greater_equal, actual >= expected_ ) MOCK_CONSTRAINT(greater_equal, actual >= expected_)
#undef MOCK_CONSTRAINT #undef MOCK_CONSTRAINT

2
src/tests/turtle_test/integration_test.cpp
View file

@ -321,7 +321,7 @@ namespace
}; };
} }
BOOST_AUTO_TEST_CASE( boost_optional_on_base_class_reference_as_return_type ) BOOST_AUTO_TEST_CASE( boost_optional_on_base_class_reference_as_return_type_is_supported )
{ {
boost_optional b; boost_optional b;
my_mock_observer o; my_mock_observer o;