From 76a5c5b3ec3fe805554f807cd00d821a79240486 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Mon, 21 Mar 2011 21:43:04 +0000
Subject: [PATCH] Cleanup

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@277 860be788-9bd5-4423-9f1e-828f051e677b
---
 src/libraries/turtle/log.hpp                        | 6 +++---
 src/tests/turtle_test/log_with_conversions_test.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libraries/turtle/log.hpp b/src/libraries/turtle/log.hpp
index ca23745..396534d 100644
--- a/src/libraries/turtle/log.hpp
+++ b/src/libraries/turtle/log.hpp
@@ -33,7 +33,7 @@ namespace mock
         std::ostream* s_;
     };
 
-#ifdef MOCK_LOG_CONVERSIONS
+#ifdef MOCK_LOGGING_USE_CONVERSIONS
 
 namespace detail3
 {
@@ -91,7 +91,7 @@ namespace detail3
         return s;
     }
 
-#else // MOCK_LOG_CONVERSIONS
+#else // MOCK_LOGGING_USE_CONVERSIONS
 
 namespace detail3
 {
@@ -113,7 +113,7 @@ namespace detail3
         return s;
     }
 
-#endif // MOCK_LOG_CONVERSIONS
+#endif // MOCK_LOGGING_USE_CONVERSIONS
 
 namespace detail2
 {
diff --git a/src/tests/turtle_test/log_with_conversions_test.cpp b/src/tests/turtle_test/log_with_conversions_test.cpp
index 50ca6d6..3cc0acf 100644
--- a/src/tests/turtle_test/log_with_conversions_test.cpp
+++ b/src/tests/turtle_test/log_with_conversions_test.cpp
@@ -6,7 +6,7 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#define MOCK_LOG_CONVERSIONS
+#define MOCK_LOGGING_USE_CONVERSIONS
 #include <turtle/log.hpp>
 #include <boost/assign.hpp>
 #include <vector>