v0.2.49..v0.2.50 changeset ConstrainedMatches.h

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/matching/ConstrainedMatches.h b/hoot-core/src/main/cpp/hoot/core/conflate/matching/ConstrainedMatches.h
index 0340c28..e9a75a5 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/matching/ConstrainedMatches.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/matching/ConstrainedMatches.h
@@ -28,8 +28,9 @@
 #define CONSTRAINEDMATCHES_H
 
 // Hoot
-#include <hoot/core/elements/OsmMap.h>
+#include <hoot/core/conflate/matching/Match.h>
 #include <hoot/core/conflate/matching/MatchConflicts.h>
+#include <hoot/core/elements/OsmMap.h>
 #include <hoot/core/util/Configurable.h>
 
 // Standard
@@ -40,8 +41,6 @@
 namespace hoot
 {
 
-class Match;
-
 /**
  * A class for determining a subset of matches that meet a set of constraints (isConflicting) and
  * attempting to maximize the quality of the matches chosen.
@@ -72,7 +71,7 @@ public:
    * scores. All matches will be considered so if you don't want matches below a threshold included
    * then don't add them.
    */
-  virtual std::vector<const Match*> calculateSubset() = 0;
+  virtual std::vector<ConstMatchPtr> calculateSubset() = 0;
 
   /**
    * Returns the score for the last calculateSubset operation.
@@ -86,7 +85,7 @@ public:
 protected:
 
   const ConstOsmMapPtr& _map;
-  std::vector<const Match*> _matches;
+  std::vector<ConstMatchPtr> _matches;
 
   MatchConflicts::ConflictMap _conflicts;
   double _score;