v0.2.49..v0.2.50 changeset NetworkMergerCreator.h

diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h
index 7ba95ed..89488ff 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/network/NetworkMergerCreator.h
@@ -28,8 +28,8 @@
 #define NETWORKMERGERCREATOR_H
 
 // hoot
-#include <hoot/core/elements/ConstOsmMapConsumer.h>
 #include <hoot/core/conflate/merging/MergerCreator.h>
+#include <hoot/core/elements/ConstOsmMapConsumer.h>
 
 namespace hoot
 {
@@ -44,13 +44,13 @@ public:
 
   NetworkMergerCreator();
 
-  virtual bool createMergers(const MatchSet& matches, std::vector<Merger*>& mergers) const;
+  virtual bool createMergers(const MatchSet& matches, std::vector<MergerPtr>& mergers) const override;
 
-  virtual std::vector<CreatorDescription> getAllCreators() const;
+  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 setOsmMap(const OsmMap* map) { _map = map; }
+  virtual void setOsmMap(const OsmMap* map) override { _map = map; }
 
 private: