From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 23 Mar 2016 11:36:59 +0000 (+0100)
Subject: Bring MemPools::instance as a static variable in GetInstance() to force initializatio... 
X-Git-Tag: SQUID_4_0_8~20^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1269e96f2eb895d52067caebd3f0a90591e86077;p=thirdparty%2Fsquid.git

Bring MemPools::instance as a static variable in GetInstance() to force initialization order
---

diff --git a/src/mem/Pool.cc b/src/mem/Pool.cc
index 1470d010f0..b81d561532 100644
--- a/src/mem/Pool.cc
+++ b/src/mem/Pool.cc
@@ -32,13 +32,10 @@ MemPools::GetInstance()
     /* Must use this idiom, as we can be double-initialised
      * if we are called during static initialisations.
      */
-    if (!Instance)
-        Instance = new MemPools;
-    return *Instance;
+    static MemPools Instance;
+    return Instance;
 }
 
-MemPools * MemPools::Instance = NULL;
-
 MemPoolIterator *
 memPoolIterate(void)
 {
diff --git a/src/mem/Pool.h b/src/mem/Pool.h
index e56c464660..694049c4ea 100644
--- a/src/mem/Pool.h
+++ b/src/mem/Pool.h
@@ -170,8 +170,6 @@ public:
     ssize_t mem_idle_limit;
     int poolCount;
     bool defaultIsChunked;
-private:
-    static MemPools *Instance;
 };
 
 /**