From 771d1ef783643d13a583e08c54054fa62f6fac11 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Fri, 28 Jan 2011 14:26:58 +0000
Subject: [PATCH] Cleanup

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@209 860be788-9bd5-4423-9f1e-828f051e677b
---
 src/libraries/turtle/constraint.hpp        |  6 +++---
 src/libraries/turtle/constraints.hpp       | 20 ++++++++++----------
 src/tests/turtle_test/integration_test.cpp |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/libraries/turtle/constraint.hpp b/src/libraries/turtle/constraint.hpp
index 5ed410d..577f104 100644
--- a/src/libraries/turtle/constraint.hpp
+++ b/src/libraries/turtle/constraint.hpp
@@ -6,8 +6,8 @@
 //  http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef MOCK_PLACEHOLDER_HPP_INCLUDED
-#define MOCK_PLACEHOLDER_HPP_INCLUDED
+#ifndef MOCK_CONSTRAINT_HPP_INCLUDED
+#define MOCK_CONSTRAINT_HPP_INCLUDED
 
 namespace mock
 {
@@ -21,4 +21,4 @@ namespace mock
     };
 }
 
-#endif // #ifndef MOCK_PLACEHOLDER_HPP_INCLUDED
+#endif // #ifndef MOCK_CONSTRAINT_HPP_INCLUDED
diff --git a/src/libraries/turtle/constraints.hpp b/src/libraries/turtle/constraints.hpp
index 8587fef..974130c 100644
--- a/src/libraries/turtle/constraints.hpp
+++ b/src/libraries/turtle/constraints.hpp
@@ -29,7 +29,7 @@ namespace mock
             } \
             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;
 
-    MOCK_CONSTRAINT( any, true && &actual )
-    MOCK_CONSTRAINT( negate, ! actual )
-    MOCK_CONSTRAINT( evaluate, actual() )
+    MOCK_CONSTRAINT(any, true && &actual)
+    MOCK_CONSTRAINT(negate, ! actual)
+    MOCK_CONSTRAINT(evaluate, actual())
 
 #undef MOCK_CONSTRAINT
 
@@ -64,7 +64,7 @@ namespace mock
             } \
             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_; \
         }; \
@@ -75,11 +75,11 @@ namespace mock
         return detail::N< T >( t ); \
     }
 
-    MOCK_CONSTRAINT( equal, actual == expected_ )
-    MOCK_CONSTRAINT( less, actual < expected_ )
-    MOCK_CONSTRAINT( greater, actual > expected_ )
-    MOCK_CONSTRAINT( less_equal, actual <= expected_ )
-    MOCK_CONSTRAINT( greater_equal, actual >= expected_ )
+    MOCK_CONSTRAINT(equal, actual == expected_)
+    MOCK_CONSTRAINT(less, actual < expected_)
+    MOCK_CONSTRAINT(greater, actual > expected_)
+    MOCK_CONSTRAINT(less_equal, actual <= expected_)
+    MOCK_CONSTRAINT(greater_equal, actual >= expected_)
 
 #undef MOCK_CONSTRAINT
 
diff --git a/src/tests/turtle_test/integration_test.cpp b/src/tests/turtle_test/integration_test.cpp
index ce3444f..b3be97f 100644
--- a/src/tests/turtle_test/integration_test.cpp
+++ b/src/tests/turtle_test/integration_test.cpp
@@ -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;
     my_mock_observer o;