v0.2.54..v0.2.55 changeset TagMergerFactory.h

diff --git a/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.h b/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.h
index 74b136c..c757f5f 100644
--- a/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.h
+++ b/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.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 TAGMERGERFACTORY_H
 #define TAGMERGERFACTORY_H
@@ -48,8 +48,6 @@ class TagMergerFactory
 {
 public:
 
-  ~TagMergerFactory();
-
   static TagMergerFactory& getInstance();
 
   /**
@@ -76,12 +74,15 @@ public:
 
 private:
 
-  TagMergerFactory();
-
   QHash<QString, std::shared_ptr<TagMerger>> _mergers;
   std::shared_ptr<TagMerger> _default;
 
-  static std::shared_ptr<TagMergerFactory> _theInstance;
+  /** Default constructor/destructor */
+  TagMergerFactory() = default;
+  ~TagMergerFactory() = default;
+  /** Delete copy constructor and assignment operator */
+  TagMergerFactory(const TagMergerFactory&) = delete;
+  TagMergerFactory& operator=(const TagMergerFactory&) = delete;
 };
 
 }