diff options
author | Henning Baldersheim <balder@oath.com> | 2018-04-03 14:08:01 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@oath.com> | 2018-04-03 14:08:01 +0200 |
commit | 39a40b07cef9e73a46b4c1f00f4f213478faca57 (patch) | |
tree | b99907e6f4aff148386a926316a95b1276b79e63 /searchcommon | |
parent | 9e70b2520ace7245a949553f9f92646db910b804 (diff) |
Nested namespace and default destructors
Diffstat (limited to 'searchcommon')
-rw-r--r-- | searchcommon/src/vespa/searchcommon/common/datatype.cpp | 6 | ||||
-rw-r--r-- | searchcommon/src/vespa/searchcommon/common/datatype.h | 6 | ||||
-rw-r--r-- | searchcommon/src/vespa/searchcommon/common/schema.h | 10 |
3 files changed, 5 insertions, 17 deletions
diff --git a/searchcommon/src/vespa/searchcommon/common/datatype.cpp b/searchcommon/src/vespa/searchcommon/common/datatype.cpp index 12192bb1bec..81e6b8a1f34 100644 --- a/searchcommon/src/vespa/searchcommon/common/datatype.cpp +++ b/searchcommon/src/vespa/searchcommon/common/datatype.cpp @@ -5,9 +5,7 @@ #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/arraysize.h> -namespace search { -namespace index { -namespace schema { +namespace search::index::schema { using config::InvalidConfigException; @@ -99,5 +97,3 @@ operator<<(std::ostream &os, const CollectionType &type) } } -} -} diff --git a/searchcommon/src/vespa/searchcommon/common/datatype.h b/searchcommon/src/vespa/searchcommon/common/datatype.h index 7ba21e0496c..ad762b9acc4 100644 --- a/searchcommon/src/vespa/searchcommon/common/datatype.h +++ b/searchcommon/src/vespa/searchcommon/common/datatype.h @@ -4,9 +4,7 @@ #include <vespa/vespalib/stllike/string.h> -namespace search { -namespace index { -namespace schema { +namespace search::index::schema { /** * Basic data type for a field. @@ -46,5 +44,3 @@ std::ostream &operator<<(std::ostream &os, const CollectionType &type); } -} -} diff --git a/searchcommon/src/vespa/searchcommon/common/schema.h b/searchcommon/src/vespa/searchcommon/common/schema.h index 7606b36a777..374ea840f5c 100644 --- a/searchcommon/src/vespa/searchcommon/common/schema.h +++ b/searchcommon/src/vespa/searchcommon/common/schema.h @@ -8,11 +8,8 @@ #include <vespa/vespalib/util/ptrholder.h> #include <vector> -namespace vespalib { - class asciistream; -} -namespace search { -namespace index { +namespace vespalib { class asciistream; } +namespace search::index { /** * Schema class used to give a high-level description of the content @@ -419,5 +416,4 @@ public: bool empty() const; }; -} // namespace search::index -} // namespace search +} |