Nested namespace

2 files changed, 7 insertions, 13 deletions

diff --git a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp
index 99974225e9e..e52ad78c2ba 100644
--- a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp
+++ b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.cpp
@@ -1,14 +1,12 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/vdslib/distribution/redundancygroupdistribution.h>
-
-#include <algorithm>
-#include <boost/lexical_cast.hpp>
+#include "redundancygroupdistribution.h"
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/text/stringtokenizer.h>
+#include <boost/lexical_cast.hpp>
+#include <algorithm>
 
-namespace storage {
-namespace lib {
+namespace storage::lib {
 
 namespace {
     void verifyLegal(vespalib::StringTokenizer& st,
@@ -144,6 +142,4 @@ RedundancyGroupDistribution::divideSpecifiedCopies(
     return redundancy;
 }
 
-} // lib
-} // storage
-
+}
diff --git a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h
index 33f895cadf0..73013b6ce81 100644
--- a/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h
+++ b/vdslib/src/vespa/vdslib/distribution/redundancygroupdistribution.h
@@ -11,8 +11,7 @@
 #include <vector>
 #include <vespa/vespalib/stllike/string.h>
 
-namespace storage {
-namespace lib {
+namespace storage::lib {
 
 class RedundancyGroupDistribution : public document::Printable {
     std::vector<uint16_t> _values;
@@ -47,5 +46,4 @@ private:
             uint16_t redundancy, const std::vector<uint16_t>& maxValues);
 };
 
-} // lib
-} // storage
+}