Skip to content

v0.2.54..v0.2.55 changeset PoiPolygonMergerCreator.cpp

Garret Voltz edited this page Aug 14, 2020 · 1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMergerCreator.cpp b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMergerCreator.cpp
index ba4e993..c301898 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMergerCreator.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/poi-polygon/PoiPolygonMergerCreator.cpp
@@ -148,7 +148,7 @@ vector<CreatorDescription> PoiPolygonMergerCreator::getAllCreators() const
 }
 
 bool PoiPolygonMergerCreator::isConflicting(const ConstOsmMapPtr& map, ConstMatchPtr m1,
-  ConstMatchPtr m2) const
+  ConstMatchPtr m2, const QHash<QString, ConstMatchPtr>& /*matches*/) const
 {
   LOG_VART(m1);
   LOG_VART(m2);
Clone this wiki locally