X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2Fsingleton.cti;h=d12446804771adff5c83bfd7711c4f08562de2df;hb=1b1d76302a5d61e918ef71f1c8e11f80ac1262e2;hp=b99e39d44f3a73c76463e1a448f542a0d3d775e3;hpb=88fb64d9945353340238d1b8c5b7a1038ad7a775;p=senf.git

diff --git a/Utils/singleton.cti b/Utils/singleton.cti
index b99e39d..d124468 100644
--- a/Utils/singleton.cti
+++ b/Utils/singleton.cti
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -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_