v0.2.54..v0.2.55 changeset BuildingPartMergeOp.cpp - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/ops/BuildingPartMergeOp.cpp b/hoot-core/src/main/cpp/hoot/core/ops/BuildingPartMergeOp.cpp
index 0233081..a97feba 100644
--- a/hoot-core/src/main/cpp/hoot/core/ops/BuildingPartMergeOp.cpp
+++ b/hoot-core/src/main/cpp/hoot/core/ops/BuildingPartMergeOp.cpp
@@ -22,7 +22,7 @@
  * This will properly maintain the copyright information. DigitalGlobe
  * copyrights will be updated automatically.
  *
- * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019 DigitalGlobe (http://www.digitalglobe.com/)
+ * @copyright Copyright (C) 2015, 2016, 2017, 2018, 2019, 2020 DigitalGlobe (http://www.digitalglobe.com/)
  */
 #include "BuildingPartMergeOp.h"
 
@@ -357,9 +357,9 @@ std::set<long> BuildingPartMergeOp::_calculateNeighbors(const ConstWayPtr& way,
 bool BuildingPartMergeOp::_compareTags(Tags t1, Tags t2)
 {
   // remove all the building tags that are building:part=yes specific.
-  const std::set<QString> buildingPartTagNames =
+  const QSet<QString> buildingPartTagNames =
     BuildingRelationMemberTagMerger::getBuildingPartTagNames();
-  for (std::set<QString>::const_iterator it = buildingPartTagNames.begin();
+  for (QSet<QString>::const_iterator it = buildingPartTagNames.begin();
        it != buildingPartTagNames.end(); ++it)
   {
     t1.remove(*it);