-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.54..v0.2.55 changeset TagMergerFactory.cpp
Garret Voltz edited this page Aug 14, 2020
·
1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.cpp b/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.cpp
index 0928250..ce1243f 100644
--- a/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/schema/TagMergerFactory.cpp
@@ -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/)
*/
#include "TagMergerFactory.h"
@@ -35,24 +35,11 @@
namespace hoot
{
-std::shared_ptr<TagMergerFactory> TagMergerFactory::_theInstance;
-
-TagMergerFactory::TagMergerFactory()
-{
-}
-
-TagMergerFactory::~TagMergerFactory()
-{
- reset();
-}
-
TagMergerFactory& TagMergerFactory::getInstance()
{
- if (!_theInstance.get())
- {
- _theInstance.reset(new TagMergerFactory());
- }
- return *_theInstance;
+ // Local static singleton instance
+ static TagMergerFactory instance;
+ return instance;
}
std::shared_ptr<TagMerger> TagMergerFactory::getDefaultPtr()