-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.54..v0.2.55 changeset MatchGraphTest.cpp
Garret Voltz edited this page Aug 14, 2020
·
1 revision
diff --git a/hoot-core-test/src/test/cpp/hoot/core/conflate/matching/MatchGraphTest.cpp b/hoot-core-test/src/test/cpp/hoot/core/conflate/matching/MatchGraphTest.cpp
index ae75f61..1a68427 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/conflate/matching/MatchGraphTest.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/conflate/matching/MatchGraphTest.cpp
@@ -22,7 +22,7 @@
* This will properly maintain the copyright information. DigitalGlobe
* copyrights will be updated automatically.
*
- * @copyright Copyright (C) 2013, 2014, 2015, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2013, 2014, 2015, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
*/
/*
@@ -72,7 +72,8 @@ class FakeMatch : public Match
public:
FakeMatch() : Match(std::shared_ptr<MatchThreshold>()) {}
- FakeMatch(ElementId eid1, ElementId eid2, double p, const std::shared_ptr<const MatchThreshold>& mt) :
+ FakeMatch(ElementId eid1, ElementId eid2, double p,
+ const std::shared_ptr<const MatchThreshold>& mt) :
Match(mt),
_eid1(eid1),
_eid2(eid2),
@@ -91,7 +92,8 @@ public:
virtual double getProbability() const { return _p; }
- virtual bool isConflicting(const ConstMatchPtr& /*other*/, const ConstOsmMapPtr& /*map*/) const
+ virtual bool isConflicting(const ConstMatchPtr& /*other*/, const ConstOsmMapPtr& /*map*/,
+ const QHash<QString, ConstMatchPtr>& /*matches*/) const
{
return false;
}