Skip to content

v0.2.54..v0.2.55 changeset Stxxl.cpp

Garret Voltz edited this page Aug 14, 2020 · 1 revision
diff --git a/tgs/src/main/cpp/tgs/BigContainers/Stxxl.cpp b/tgs/src/main/cpp/tgs/BigContainers/Stxxl.cpp
index d7cdb35..221e6ee 100644
--- a/tgs/src/main/cpp/tgs/BigContainers/Stxxl.cpp
+++ b/tgs/src/main/cpp/tgs/BigContainers/Stxxl.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "Stxxl.h"
 
@@ -44,24 +44,16 @@
 namespace Tgs
 {
 
-std::shared_ptr<Stxxl> Stxxl::_theInstance;
-
 Stxxl::Stxxl()
 {
   _init();
 }
 
-Stxxl::~Stxxl()
-{
-}
-
 Stxxl& Stxxl::getInstance()
 {
-  if (!_theInstance.get())
-  {
-    _theInstance.reset(new Stxxl());
-  }
-  return *_theInstance;
+  //  Local static singleton instance
+  static Stxxl instance;
+  return instance;
 }
 
 void Stxxl::_init()
Clone this wiki locally