v0.2.55..v0.2.56 changeset HighwayMergerAbstract.h
Garret Voltz edited this page Aug 14, 2020
·
3 revisions
diff --git a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerAbstract.h b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerAbstract.h
index 0f3a2c9..f8fdccd 100644
--- a/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerAbstract.h
+++ b/hoot-core/src/main/cpp/hoot/core/conflate/highway/HighwayMergerAbstract.h
@@ -22,7 +22,7 @@
* This will properly maintain the copyright information. DigitalGlobe
* copyrights will be updated automatically.
*
- * @copyright Copyright (C) 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
*/
#ifndef HIGHWAY_MERGER_ABSTRACT_H
#define HIGHWAY_MERGER_ABSTRACT_H
@@ -85,9 +85,8 @@ public:
static std::string className() { return "hoot::HighwayMergerAbstract"; }
- static int logWarnCount;
-
- virtual ~HighwayMergerAbstract() {}
+ HighwayMergerAbstract() = default;
+ virtual ~HighwayMergerAbstract() = default;
virtual void apply(const OsmMapPtr& map,
std::vector<std::pair<ElementId, ElementId>>& replaced) override = 0;
@@ -96,6 +95,8 @@ public:
protected:
+ static int logWarnCount;
+
virtual PairsSet& _getPairs() override { return _pairs; }
virtual const PairsSet& _getPairs() const override { return _pairs; }