Cleanup

git-svn-id: https://svn.code.sf.net/p/turtle/code/trunk@337 860be788-9bd5-4423-9f1e-828f051e677b

src/libraries/turtle/function.hpp

@@ -197,7 +197,7 @@ namespace mock
             expectation_type& expect()
             {
                 if( ! parent_ )
-                    set_parent( root );
+                    set_parent( mock::detail::root );
                 expectations_.push_back( expectation_type() );
                 valid_ = true;
                 return expectations_.back();

src/libraries/turtle/node.hpp

@@ -35,13 +35,13 @@ namespace mock
             return name_;
         }
 
-        void add( verifiable& e )
+        void add( verifiable& v )
         {
-            v_.push_back( &e );
+            v_.push_back( &v );
         }
-        void remove( verifiable& e )
+        void remove( verifiable& v )
         {
-            v_.erase( std::remove( v_.begin(), v_.end(), &e ), v_.end() );
+            v_.erase( std::remove( v_.begin(), v_.end(), &v ), v_.end() );
         }
 
         virtual bool verify() const

src/libraries/turtle/object.hpp

@@ -59,13 +59,13 @@ namespace mock
             {
                 if( ! parent_ )
                 {
-                    root.add( *this );
+                    mock::detail::root.add( *this );
-                    parent_ = &root;
+                    parent_ = &mock::detail::root;
                 }
                 t.set_parent( *this );
             }
 
-        protected:
+        private:
             virtual void untie()
             {
                 parent_ = 0;

src/libraries/turtle/root.hpp

@@ -14,24 +14,27 @@
 #include <boost/test/utils/trivial_singleton.hpp>
 
 namespace mock
+{
+namespace detail
 {
     class root_t : public boost::unit_test::singleton< root_t >, public node
     {
-    protected:
+    private:
         virtual void untie()
         {}
     private:
         BOOST_TEST_SINGLETON_CONS( root_t );
     };
     BOOST_TEST_SINGLETON_INST( root )
+}
 
     inline bool verify()
     {
-        return root.verify();
+        return mock::detail::root.verify();
     }
     inline void reset()
     {
-        root.reset();
+        mock::detail::root.reset();
     }
 }