v0.2.55..v0.2.56 changeset MatchFactory.h - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.h b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.h
index ca31f17..1e0a063 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/matching/MatchFactory.h
@@ -48,8 +48,6 @@ class MatchFactory : public Configurable
 {
 public:
 
-  ~MatchFactory();
-
   /**
    * Returns the default MatchFactory with the default creators registered.
    */
@@ -112,16 +110,15 @@ private:
   // allows for matching a subset of the input data
   QString _tagFilter;
 
-  static std::shared_ptr<MatchFactory> _theInstance;
-
   std::vector<std::shared_ptr<MatchCreator>> _creators;
 
   MatchFactory();
+  virtual ~MatchFactory() = default;
 
   void _checkMatchCreatorBoundable(const std::shared_ptr<MatchCreator>& matchCreator,
                                    const geos::geom::Envelope& bounds) const;
-  static void _setMatchCreators(QStringList matchCreatorsList);
-  static void _setTagFilter(QString filter) { _theInstance->_tagFilter = filter; }
+  void _setMatchCreators(QStringList matchCreatorsList);
+  void _setTagFilter(QString filter) { _tagFilter = filter; }
 
   friend class MatchCandidateCountVisitorTest;
   friend class MatchCandidateCountVisitorRndTest;