Skip to content

v0.2.54..v0.2.55 changeset MultiaryUtilities.h

Garret Voltz edited this page Aug 14, 2020 · 1 revision
diff --git a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.h b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.h
index 8ae8236..1f259c4 100644
--- a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.h
+++ b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef MULTIARYUTILITIES_H
 #define MULTIARYUTILITIES_H
@@ -147,9 +147,12 @@ public:
 
 private:
 
-  MultiaryUtilities() {}
-
-  static std::shared_ptr<MultiaryUtilities> _theInstance;
+  /** Default constructor/destructor */
+  MultiaryUtilities() = default;
+  ~MultiaryUtilities() = default;
+  /** Delete copy constructor and assignment operator */
+  MultiaryUtilities(const MultiaryUtilities&) = delete;
+  MultiaryUtilities& operator=(const MultiaryUtilities&) = delete;
 
   std::shared_ptr<SearchBoundsCalculator> _searchBoundsCalculator;
 };
Clone this wiki locally