From b6c2dec8fa2a3a1041080654b61bb4072e6fd09f Mon Sep 17 00:00:00 2001
From: Sakari Bergen <sakari.bergen@beatwaves.net>
Date: Sun, 24 Mar 2013 21:18:20 +0200
Subject: Fix static initialization order problem

---
 libs/pbd/debug.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'libs/pbd/debug.cc')

diff --git a/libs/pbd/debug.cc b/libs/pbd/debug.cc
index 98d0fc5091..c86afbe87e 100644
--- a/libs/pbd/debug.cc
+++ b/libs/pbd/debug.cc
@@ -34,7 +34,11 @@ static uint64_t _debug_bit = 1;
 typedef std::map<const char*,uint64_t> DebugMap;
 
 namespace PBD {
-	DebugMap _debug_bit_map;
+	DebugMap & _debug_bit_map()
+	{
+		static DebugMap map;
+		return map;
+	}
 }
 
 uint64_t PBD::DEBUG::Stateful = PBD::new_debug_bit ("stateful");
@@ -50,7 +54,7 @@ uint64_t
 PBD::new_debug_bit (const char* name)
 {
         uint64_t ret;
-        _debug_bit_map.insert (make_pair (name, _debug_bit));
+        _debug_bit_map().insert (make_pair (name, _debug_bit));
         ret = _debug_bit;
         _debug_bit <<= 1;
         return ret;
@@ -91,7 +95,7 @@ PBD::parse_debug_options (const char* str)
 			return 0;
 		}
 
-                for (map<const char*,uint64_t>::iterator i = _debug_bit_map.begin(); i != _debug_bit_map.end(); ++i) {
+		for (map<const char*,uint64_t>::iterator i = _debug_bit_map().begin(); i != _debug_bit_map().end(); ++i) {
                         if (strncasecmp (p, i->first, strlen (p)) == 0) {
                                 bits |= i->second;
                         }
@@ -113,7 +117,7 @@ PBD::list_debug_options ()
 
 	vector<string> options;
 
-        for (map<const char*,uint64_t>::iterator i = _debug_bit_map.begin(); i != _debug_bit_map.end(); ++i) {
+	for (map<const char*,uint64_t>::iterator i = _debug_bit_map().begin(); i != _debug_bit_map().end(); ++i) {
 		options.push_back (i->first);
         }
 
-- 
cgit v1.2.3