-
Notifications
You must be signed in to change notification settings - Fork 74
v0.2.49..v0.2.50 changeset BuildingMergerCreator.h
Garret Voltz edited this page Nov 6, 2019
·
1 revision
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/polygon/BuildingMergerCreator.h b/hoot-core/src/main/cpp/hoot/core/conflate/polygon/BuildingMergerCreator.h
index e5b88bc..de352f8 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/polygon/BuildingMergerCreator.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/polygon/BuildingMergerCreator.h
@@ -44,11 +44,11 @@ public:
/**
* If all the matches are BuildingMatches, a single BuildingMerge 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;
};
}