Skip to content

v0.2.54..v0.2.55 changeset Stxxl.h

Garret Voltz edited this page Aug 14, 2020 · 1 revision
diff --git a/tgs/src/main/cpp/tgs/BigContainers/Stxxl.h b/tgs/src/main/cpp/tgs/BigContainers/Stxxl.h
index 004f2c8..5868cbd 100644
--- a/tgs/src/main/cpp/tgs/BigContainers/Stxxl.h
+++ b/tgs/src/main/cpp/tgs/BigContainers/Stxxl.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef STXXL_H
 #define STXXL_H
@@ -44,8 +44,6 @@ class Stxxl
 {
 public:
 
-  ~Stxxl();
-
   /**
    * Initializes the STXXL container.
    */
@@ -62,13 +60,17 @@ public:
 
 private:
 
-  static std::shared_ptr<Stxxl> _theInstance;
+  void _init();
+  QString _removeComments(QString s);
+
   QTemporaryFile _configFileTmp;
 
   Stxxl();
-
-  void _init();
-  QString _removeComments(QString s);
+  /** Default destructor */
+  ~Stxxl() = default;
+  /** Delete copy constructor and assignment operator */
+  Stxxl(const Stxxl&) = delete;
+  Stxxl& operator=(const Stxxl&) = delete;
 };
 
 }
Clone this wiki locally