-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.49..v0.2.50 changeset HighwayMergerCreator.h
Garret Voltz edited this page Nov 6, 2019
·
1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.h b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.h
index f3202a6..82564ad 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerCreator.h
@@ -45,13 +45,13 @@ public:
/**
* If there is a single HighwayMatch, a single HighwayMergerCreator will be created and returned.
*/
- virtual bool createMergers(const MatchSet& matches, std::vector<Merger*>& mergers) const override;
+ virtual bool createMergers(const MatchSet& matches, std::vector<MergerPtr>& mergers) const override;
virtual std::vector<CreatorDescription> getAllCreators() const override;
- virtual bool isConflicting(const ConstOsmMapPtr& map, const Match* m1, const Match* m2) const;
+ virtual bool isConflicting(const ConstOsmMapPtr& map, ConstMatchPtr m1, ConstMatchPtr m2) const override;
- virtual void setConfiguration(const Settings &conf);
+ virtual void setConfiguration(const Settings &conf) override;
private: