From 5eceba381a8c6e78757c05302538f805d597b491 Mon Sep 17 00:00:00 2001
From: mat007 <mat007@860be788-9bd5-4423-9f1e-828f051e677b>
Date: Sun, 23 Nov 2014 10:54:05 +0000
Subject: [PATCH] Cleanup

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@758 860be788-9bd5-4423-9f1e-828f051e677b
---
 turtle/detail/expectation_template.hpp | 8 ++++----
 turtle/detail/matcher_base.hpp         | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/turtle/detail/expectation_template.hpp b/turtle/detail/expectation_template.hpp
index 2bd6285..74a46da 100644
--- a/turtle/detail/expectation_template.hpp
+++ b/turtle/detail/expectation_template.hpp
@@ -28,7 +28,7 @@
     && (*c##n##_)( a##n )
 
 #define MOCK_EXPECTATION_SERIALIZE(z, n, d) \
-    BOOST_PP_IF(n, << ", " <<,) *m.c##n##_
+    BOOST_PP_IF(n, << ", " <<,) *e.c##n##_
 
 #define MOCK_EXPECTATION_IN_ADD(z, n, d ) \
     s##n.impl_->add( this ); sequences_.push_back( s##n.impl_ );
@@ -163,10 +163,10 @@ namespace detail
         }
 
         friend std::ostream& operator<<(
-            std::ostream& s, const expectation& m )
+            std::ostream& s, const expectation& e )
         {
-            return s << (m.i_->exhausted() ? 'v' : '.')
-                << ' ' << *m.i_
+            return s << (e.i_->exhausted() ? 'v' : '.')
+                << ' ' << *e.i_
 #ifndef MOCK_NUM_ARGS_0
                 << ".with( "
                 << BOOST_PP_REPEAT(MOCK_NUM_ARGS,
diff --git a/turtle/detail/matcher_base.hpp b/turtle/detail/matcher_base.hpp
index cfe0e6f..0e4c552 100644
--- a/turtle/detail/matcher_base.hpp
+++ b/turtle/detail/matcher_base.hpp
@@ -26,11 +26,12 @@ namespace detail
         virtual bool operator()( Actual ) = 0;
 
         friend std::ostream& operator<<(
-            std::ostream& s, const matcher_base& c )
+            std::ostream& s, const matcher_base& m )
         {
-            c.serialize( s );
+            m.serialize( s );
             return s;
         }
+
     private:
         virtual void serialize( std::ostream& ) const = 0;
     };