Changeset 64b9bf in git

Timestamp:

Oct 23, 2013, 7:01:26 PM (9 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

25761d107c152ed2282675247e571d5cfac99ef4

Parents:

319eab5422b663cf987a25ed055f76e33b2b9751

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-10-23 19:01:26+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2013-10-24 23:39:48+02:00

Message:

Fixed brocken linkage under OSX

Location:

factory

Files:

• cf_globals.cc (modified) (2 diffs)
• cf_globals.h (modified) (1 diff)
• cf_switches.h (modified) (2 diffs)

factory/cf_globals.cc

@@ -13 +13 @@
 #endif /* HAVE_CONFIG_H */
 
-#include "cf_switches.h"
 
 //{{{ extern const char factoryVersion[];
@@ -41 +40 @@
 //}}}
 
-//{{{ CFSwitches cf_glob_switches;
-//{{{ docu
-//
-// cf_glob_switches - factory switches.
-//
-// This is the only object of type CFSwitches in factory.  It is
-// used either directly in the low level algorithms or by the
-// functions On(), Off(), isOn() defined in canonicalform.cc.
-//
-//}}}
-CFSwitches cf_glob_switches;
-//}}}

factory/cf_globals.h

@@ -21 +21 @@
 /*ENDPUBLIC*/
 
-extern CFSwitches cf_glob_switches;
 
 #endif /* ! INCL_CF_GLOBALS_H */

factory/cf_switches.h

@@ -54 +54 @@
     bool switches [CFSwitchesMax];
 
+    CFSwitches ();
 public:
     // constructors, destructors
-    CFSwitches ();
     ~CFSwitches () {}
 
+    static CFSwitches& getInstance() 
+    {
+       static CFSwitches singleton;
+       return singleton;
+    }
     // selectors
     void On ( int s ) { switches[s] = true; }
@@ -66 +71 @@
 };
 //}}}
+//{{{ CFSwitches cf_glob_switches;
+//{{{ docu
+//
+// cf_glob_switches - factory switches.
+//
+// This is the only object of type CFSwitches in factory.  It is
+// used either directly in the low level algorithms or by the
+// functions On(), Off(), isOn() defined in canonicalform.cc.
+//
+//}}}
+// extern CFSwitches& cf_glob_switches;
+// CFSwitches& cf_glob_switches = CFSwitches::getInstance();
+#define cf_glob_switches (CFSwitches::getInstance())
+//}}}
 
 #endif /* ! INCL_CF_SWITCHES_H */