v0.2.54..v0.2.55 changeset JsRegistrar.h - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-js/src/main/cpp/hoot/js/JsRegistrar.h b/hoot-js/src/main/cpp/hoot/js/JsRegistrar.h
index 425f02e..4a7c391 100644
--- a/hoot-js/src/main/cpp/hoot/js/JsRegistrar.h
+++ b/hoot-js/src/main/cpp/hoot/js/JsRegistrar.h
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #ifndef JSREGISTRAR_H
 #define JSREGISTRAR_H
@@ -56,9 +56,7 @@ class ClassInitializerTemplate : public ClassInitializer
 {
 public:
 
-  ClassInitializerTemplate()
-  {
-  }
+  ClassInitializerTemplate() { }
 
   virtual ~ClassInitializerTemplate() { }
 
@@ -86,9 +84,13 @@ public:
 private:
 
   std::vector<std::shared_ptr<ClassInitializer>> _initializers;
-  static std::shared_ptr<JsRegistrar> _theInstance;
 
-  JsRegistrar();
+  /** Default constructor/destructor */
+  JsRegistrar() = default;
+  ~JsRegistrar() = default;
+  /** Delete copy constructor and assignment operator */
+  JsRegistrar(const JsRegistrar&) = delete;
+  JsRegistrar& operator=(const JsRegistrar&) = delete;
 };
 
 template<class T>