git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@278 860be788-9bd5-4423-9f1e-828f051e677b
This commit is contained in:
mat007 2011-03-21 21:48:28 +00:00
parent 76a5c5b3ec
commit 29975de820
2 changed files with 4 additions and 4 deletions

View file

@ -33,7 +33,7 @@ namespace mock
std::ostream* s_; std::ostream* s_;
}; };
#ifdef MOCK_LOGGING_USE_CONVERSIONS #ifdef MOCK_USE_CONVERSIONS
namespace detail3 namespace detail3
{ {
@ -91,7 +91,7 @@ namespace detail3
return s; return s;
} }
#else // MOCK_LOGGING_USE_CONVERSIONS #else // MOCK_USE_CONVERSIONS
namespace detail3 namespace detail3
{ {
@ -113,7 +113,7 @@ namespace detail3
return s; return s;
} }
#endif // MOCK_LOGGING_USE_CONVERSIONS #endif // MOCK_USE_CONVERSIONS
namespace detail2 namespace detail2
{ {

View file

@ -6,7 +6,7 @@
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// //
#define MOCK_LOGGING_USE_CONVERSIONS #define MOCK_USE_CONVERSIONS
#include <turtle/log.hpp> #include <turtle/log.hpp>
#include <boost/assign.hpp> #include <boost/assign.hpp>
#include <vector> #include <vector>