Fixed a crash due to static initialization order fiasco on some platforms

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

src/libraries/turtle/function.hpp

@@ -120,7 +120,7 @@ namespace mock
         public:
             function_impl()
                 : name_( "?" )
-                , parent_( &root )
+                , parent_( &root() )
                 , valid_( true )
             {
                 parent_->add( *this );

src/libraries/turtle/node.hpp

@@ -20,6 +20,21 @@ namespace mock
     class node : protected verifiable
     {
     public:
+        virtual ~node()
+        {
+            std::for_each( v_.begin(), v_.end(),
+                std::mem_fun( &verifiable::untie ) );
+        }
+
+        void tag( const std::string& name )
+        {
+            name_ = name;
+        }
+        const std::string& tag() const
+        {
+            return name_;
+        }
+
         void add( verifiable& e )
         {
             v_.push_back( &e );
@@ -42,24 +57,10 @@ namespace mock
             std::for_each( v_.begin(), v_.end(),
                 std::mem_fun( &verifiable::reset ) );
         }
-        virtual void untie()
-        {}
-
-        void tag( const std::string& name )
-        {
-            name_ = name;
-        }
-        const std::string& tag() const
-        {
-            return name_;
-        }
 
     protected:
-        virtual ~node()
+        virtual void untie()
-        {
+        {}
-            std::for_each( v_.begin(), v_.end(),
-                std::mem_fun( &verifiable::untie ) );
-        }
 
     private:
         typedef std::vector< verifiable* > verifiables_type;

src/libraries/turtle/object.hpp

@@ -49,11 +49,11 @@ namespace mock
         public:
             object_impl()
             {
-                root.add( *this );
+                root().add( *this );
             }
             virtual ~object_impl()
             {
-                root.remove( *this );
+                root().remove( *this );
             }
         };
 

src/libraries/turtle/root.hpp

@@ -11,24 +11,22 @@
 
 #include "config.hpp"
 #include "node.hpp"
-#include <boost/test/utils/trivial_singleton.hpp>
 
 namespace mock
 {
-    class root_t : public boost::unit_test::singleton< root_t >, public node
+    inline node& root()
     {
-    private:
+        static node r;
-        BOOST_TEST_SINGLETON_CONS( root_t );
+        return r;
-    };
+    }
-    BOOST_TEST_SINGLETON_INST( root )
 
     inline bool verify()
     {
-        return root.verify();
+        return root().verify();
     }
     inline void reset()
     {
-        root.reset();
+        root().reset();
     }
 }