X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2Fsingleton.cti;h=51a8c8919b7e0a21271e5a5abc5c7cb502e69179;hb=e8b91aa6a817af6d9a3714e7b66be6c0d6b0a4e5;hp=b99e39d44f3a73c76463e1a448f542a0d3d775e3;hpb=d8bc539afe01f0fb69fe1a63148c5c20eec19723;p=senf.git

diff --git a/Utils/singleton.cti b/Utils/singleton.cti
index b99e39d..51a8c89 100644
--- a/Utils/singleton.cti
+++ b/Utils/singleton.cti
@@ -34,14 +34,16 @@ template <class Self>
 prefix_ Self & senf::singleton<Self>::instance()
 {
     static Self instance_;
-    creator_.nop(); // Force instantiation of force_creation
+    // Force instantiation of force_creation (at static object creation time)
+    creator_.nop(); 
     return instance_;
 }
 
 template <class Self>
 prefix_ senf::singleton<Self>::force_creation::force_creation()
 {
-    senf::singleton<Self>::instance(); // Force execution of instance() thereby creating instance
+    // Force execution of instance() thereby creating instance
+    senf::singleton<Self>::instance();
 }
 
 template <class Self>
@@ -52,7 +54,7 @@ prefix_ void senf::singleton<Self>::force_creation::nop()
 }
 
 template <class Self>
-typename senf::singleton<Self>::force_creation senf::singleton<Self>::create_;
+typename senf::singleton<Self>::force_creation senf::singleton<Self>::creator_;
 
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_