[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/kconfig_compiler
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-03-13 23:17:22
Message-ID: 1205450242.172536.14533.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 785402 by mkretz:

If it's a singleton then "deregister" from the K_GLOBAL_STATIC on destruction. This \
is either without effect (most cases). Or, if it's a singleton inheriting another \
singleton, fixes destruction where the object would get deleted from multiple \
K_GLOBAL_STATIC destructors.

 M  +3 -0      kconfig_compiler.cpp  


--- trunk/KDE/kdelibs/kdecore/kconfig_compiler/kconfig_compiler.cpp #785401:785402
@@ -2011,6 +2011,9 @@
   if ( singleton ) {
     if ( dpointer )
       cpp << "  delete d;" << endl;
+    cpp << "  if (!s_global" << className << ".isDestroyed()) {" << endl;
+    cpp << "    s_global" << className << "->q = 0;" << endl;
+    cpp << "  }" << endl;
   }
   cpp << "}" << endl << endl;
 


[prev in list] [next in list] [prev in thread] [next in thread]