Lets stick to std:: when we have similar functionality there.

2 files changed, 2 insertions, 19 deletions

diff --git a/storage/src/vespa/storage/common/statusmetricconsumer.cpp b/storage/src/vespa/storage/common/statusmetricconsumer.cpp
index 4f94fbb0be8..d81de03919d 100644
--- a/storage/src/vespa/storage/common/statusmetricconsumer.cpp
+++ b/storage/src/vespa/storage/common/statusmetricconsumer.cpp
@@ -436,19 +436,6 @@ StatusMetricConsumer::printHtmlMetricsReport(
         std::ostream& out, const metrics::MetricSnapshot& data,
         bool includeNotUsed) const
 {
-    using namespace boost::assign;
-
-    /*
-    std::cerr << "All metrics available:\n";
-    for (MetricSnapshot::const_iterator it = data.begin();
-         it != data.end(); ++it)
-    {
-        std::cerr << "  '" << it->first << "' => '";
-        it->second->printXml(std::cerr);
-        std::cerr << "'.\n";
-    }
-    */
-
     std::map<String, Metric::SP> usedMetrics;
 
     out << "<h2>Metrics report for the last "
diff --git a/storage/src/vespa/storage/tools/generatedistributionbits.cpp b/storage/src/vespa/storage/tools/generatedistributionbits.cpp
index 0bf27c5f05c..83bf602d0c3 100644
--- a/storage/src/vespa/storage/tools/generatedistributionbits.cpp
+++ b/storage/src/vespa/storage/tools/generatedistributionbits.cpp
@@ -1,6 +1,5 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #include <vespa/fastos/fastos.h>
-#include <boost/assign.hpp>
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/vespalib/util/programoptions.h>
 #include <vespa/vdslib/distribution/distribution.h>
@@ -60,13 +59,10 @@ namespace storage {
         }
 
         void finalize() {
-            using namespace boost::assign;
             if (highRange) {
-                nodeCounts += 16, 20, 32, 48, 64, 100, 128, 160, 200, 256, 350,
-                              500, 800, 1000, 5000;
+                nodeCounts.insert(nodeCounts.begin(), {16, 20, 32, 48, 64, 100, 128, 160, 200, 256, 350, 500, 800, 1000, 5000});
             } else {
-                nodeCounts += 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,
-                              11, 12, 13, 14, 15;
+                nodeCounts.insert(nodeCounts.begin(), {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15});
             }
             for (uint32_t i=1; i<=maxBit; ++i) {
                 bitCounts.push_back(i);