v0.2.49..v0.2.50 changeset NetworkMatch.cpp

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.cpp
index aa24121..11017e9 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMatch.cpp
@@ -27,9 +27,9 @@
 #include "NetworkMatch.h"
 
 // hoot
-#include <hoot/core/util/Log.h>
-#include <hoot/core/util/Factory.h>
 #include <hoot/core/util/ConfigOptions.h>
+#include <hoot/core/util/Factory.h>
+#include <hoot/core/util/Log.h>
 
 // Standard
 #include <math.h>
@@ -148,9 +148,9 @@ void NetworkMatch::_discoverWayPairs(ConstOsmMapPtr map, ConstEdgeMatchPtr edgeM
   LOG_VART(_pairs);
 }
 
-bool NetworkMatch::isConflicting(const Match& other, const ConstOsmMapPtr& /*map*/) const
+bool NetworkMatch::isConflicting(const ConstMatchPtr& other, const ConstOsmMapPtr& /*map*/) const
 {
-  set<pair<ElementId, ElementId>> s = other.getMatchPairs();
+  set<pair<ElementId, ElementId>> s = other->getMatchPairs();
 
   // if any element ids overlap then they're conflicting.
   for (set<pair<ElementId, ElementId>>::const_iterator it = s.begin(); it != s.end(); ++it)