v0.2.49..v0.2.50 changeset MultiaryUtilities.cpp

diff --git a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.cpp b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.cpp
index 76b8fd3..d2e1b87 100644
--- a/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.cpp
+++ b/hoot-rnd/src/main/cpp/hoot/rnd/conflate/multiary/MultiaryUtilities.cpp
@@ -27,16 +27,17 @@
 #include "MultiaryUtilities.h"
 
 // hoot
+#include <hoot/core/conflate/SearchBoundsCalculator.h>
+#include <hoot/core/conflate/UnifyingConflator.h>
 #include <hoot/core/conflate/matching/MatchFactory.h>
 #include <hoot/core/conflate/merging/MergerFactory.h>
-#include <hoot/core/conflate/UnifyingConflator.h>
 #include <hoot/core/io/OsmPbfReader.h>
 #include <hoot/core/io/OsmPbfWriter.h>
 #include <hoot/core/util/Log.h>
 #include <hoot/core/util/MapProjector.h>
 #include <hoot/core/visitors/CalculateHashVisitor.h>
+
 #include <hoot/rnd/conflate/multiary/MultiaryPoiMergerCreator.h>
-#include <hoot/core/conflate/SearchBoundsCalculator.h>
 
 namespace hoot
 {
@@ -51,7 +52,8 @@ void MultiaryUtilities::conflate(OsmMapPtr map)
 
   MergerFactory::getInstance().reset();
   std::shared_ptr<MergerFactory> mergerFactory(new MergerFactory());
-  mergerFactory->registerCreator(new MultiaryPoiMergerCreator());
+  mergerFactory->registerCreator(
+        MergerCreatorPtr(new MultiaryPoiMergerCreator()));
 
   MatchThresholdPtr mt(new MatchThreshold(0.39, 0.61, 1.1));
 
@@ -166,7 +168,7 @@ QList<hoot::MultiarySimpleMatch> MultiaryUtilities::findMatches(QByteArray check
 
   for (int i = 0; i < ids.size(); i++)
   {
-    Match* m = matchFactory.createMatch(map, check->getElementId(), ElementId::node(ids[i]));
+    MatchPtr m = matchFactory.createMatch(map, check->getElementId(), ElementId::node(ids[i]));
     if (m && m->getProbability() > 0)
     {
       result.append(MultiarySimpleMatch(i, m->getProbability()));