Bring MemPools::instance as a static variable in GetInstance() to force initializatio...

diff --git a/src/mem/Pool.cc b/src/mem/Pool.cc
index 1470d010f0711abd12396323cdf39fcba3b02115..b81d561532ca7a77b655c8682b56f58b666eebd8 100644 (file)
--- 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 e56c464660b3034d0d1b2df157a66f606afab25a..694049c4ead3626524673014df2530712fdc4b86 100644 (file)
--- 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;
 };
 
 /**