v0.2.54..v0.2.55 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 11017e9..9bb9b04 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
@@ -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 "NetworkMatch.h"
 
@@ -148,7 +148,9 @@ void NetworkMatch::_discoverWayPairs(ConstOsmMapPtr map, ConstEdgeMatchPtr edgeM
   LOG_VART(_pairs);
 }
 
-bool NetworkMatch::isConflicting(const ConstMatchPtr& other, const ConstOsmMapPtr& /*map*/) const
+bool NetworkMatch::isConflicting(
+  const ConstMatchPtr& other, const ConstOsmMapPtr& /*map*/,
+  const QHash<QString, ConstMatchPtr>& /*matches*/) const
 {
   set<pair<ElementId, ElementId>> s = other->getMatchPairs();
 
@@ -158,7 +160,7 @@ bool NetworkMatch::isConflicting(const ConstMatchPtr& other, const ConstOsmMapPt
     const pair<ElementId, ElementId>& ip = *it;
 
     for (set<pair<ElementId, ElementId>>::const_iterator jt = _pairs.begin(); jt != _pairs.end();
-      ++jt)
+         ++jt)
     {
       const pair<ElementId, ElementId>& jp = *jt;