diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-06-30 09:05:08 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-06-30 09:05:08 +0000 |
commit | e8eb93027c156bd46764785ff829ddc51d29aa5a (patch) | |
tree | c9ec38eb78bb3e541c73c887b9db0d3f701102f7 | |
parent | eca1f49029248d736bdd28a12466e218c9d91d47 (diff) |
Use nested namespace
49 files changed, 58 insertions, 178 deletions
diff --git a/vespalib/src/vespa/vespalib/data/slime/array_traverser.cpp b/vespalib/src/vespa/vespalib/data/slime/array_traverser.cpp index 086b75a9168..bbf967c9f4d 100644 --- a/vespalib/src/vespa/vespalib/data/slime/array_traverser.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/array_traverser.cpp @@ -2,8 +2,6 @@ #include "array_traverser.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/array_traverser.h b/vespalib/src/vespa/vespalib/data/slime/array_traverser.h index e3deb52a838..534aa42b58c 100644 --- a/vespalib/src/vespa/vespalib/data/slime/array_traverser.h +++ b/vespalib/src/vespa/vespalib/data/slime/array_traverser.h @@ -4,8 +4,7 @@ #include "inspector.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Interface used when traversing all the entries of an array value. @@ -16,5 +15,3 @@ struct ArrayTraverser { }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/array_value.cpp b/vespalib/src/vespa/vespalib/data/slime/array_value.cpp index fe0fc4f6931..1d04bfe9c7c 100644 --- a/vespalib/src/vespa/vespalib/data/slime/array_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/array_value.cpp @@ -4,8 +4,7 @@ #include "array_traverser.h" #include "empty_value_factory.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { void ArrayValue::traverse(ArrayTraverser &at) const { @@ -29,4 +28,3 @@ Symbol ArrayValue::resolve(Memory symbol_name) { return _symbolTable.insert(symbol_name); } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/array_value.h b/vespalib/src/vespa/vespalib/data/slime/array_value.h index d3317083c29..5561b93aca2 100644 --- a/vespalib/src/vespa/vespalib/data/slime/array_value.h +++ b/vespalib/src/vespa/vespalib/data/slime/array_value.h @@ -9,8 +9,7 @@ #include <vector> #include <vespa/vespalib/util/stash.h> -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Class representing a collection of ordered values that can be @@ -51,9 +50,7 @@ public: Cursor &addObject() override; Symbol resolve(Memory symbol_name) override; - ~ArrayValue() { } + ~ArrayValue() override = default; }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/basic_value.cpp b/vespalib/src/vespa/vespalib/data/slime/basic_value.cpp index b28df713cb4..d09ac003526 100644 --- a/vespalib/src/vespa/vespalib/data/slime/basic_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/basic_value.cpp @@ -2,8 +2,7 @@ #include "basic_value.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { namespace { @@ -28,4 +27,3 @@ BasicDataValue::BasicDataValue(Memory m, Stash & stash) } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/basic_value.h b/vespalib/src/vespa/vespalib/data/slime/basic_value.h index 0c2a130e21a..0b962085b78 100644 --- a/vespalib/src/vespa/vespalib/data/slime/basic_value.h +++ b/vespalib/src/vespa/vespalib/data/slime/basic_value.h @@ -7,8 +7,7 @@ #include <vespa/vespalib/util/traits.h> #include <vespa/vespalib/util/stash.h> -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Classes representing a single basic value. @@ -60,7 +59,6 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib VESPA_CAN_SKIP_DESTRUCTION(vespalib::slime::BasicBoolValue); VESPA_CAN_SKIP_DESTRUCTION(vespalib::slime::BasicLongValue); diff --git a/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.cpp b/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.cpp index bdd593a1e4f..df87921557b 100644 --- a/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.cpp @@ -2,8 +2,6 @@ #include "basic_value_factory.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.h b/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.h index 131c4bbda5d..5562415e33e 100644 --- a/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.h +++ b/vespalib/src/vespa/vespalib/data/slime/basic_value_factory.h @@ -6,8 +6,7 @@ #include "basic_value.h" #include <vespa/vespalib/util/stash.h> -namespace vespalib { -namespace slime { +namespace vespalib::slime { struct BoolValueFactory : public ValueFactory { bool input; @@ -40,5 +39,3 @@ struct DataValueFactory : public ValueFactory { }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/binary_format.h b/vespalib/src/vespa/vespalib/data/slime/binary_format.h index bb98e6cb381..5c653207420 100644 --- a/vespalib/src/vespa/vespalib/data/slime/binary_format.h +++ b/vespalib/src/vespa/vespalib/data/slime/binary_format.h @@ -9,11 +9,9 @@ #include <vespa/vespalib/data/output_writer.h> #include <string> -namespace vespalib { +namespace vespalib { class Slime; } -class Slime; - -namespace slime { +namespace vespalib::slime { struct BinaryFormat { static void encode(const Slime &slime, Output &output); @@ -130,4 +128,3 @@ uint64_t read_bytes(InputReader &in, uint32_t bytes) } // namespace vespalib::slime::binary_format } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/convenience.cpp b/vespalib/src/vespa/vespalib/data/slime/convenience.cpp index fda19d59d8b..56592f06151 100644 --- a/vespalib/src/vespa/vespalib/data/slime/convenience.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/convenience.cpp @@ -2,8 +2,6 @@ #include "convenience.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/cursor.cpp b/vespalib/src/vespa/vespalib/data/slime/cursor.cpp index 9878220dad9..f34b49d8621 100644 --- a/vespalib/src/vespa/vespalib/data/slime/cursor.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/cursor.cpp @@ -2,8 +2,6 @@ #include "cursor.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.cpp b/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.cpp index c1bf4d42dd2..3be492b7bcc 100644 --- a/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.cpp @@ -2,8 +2,7 @@ #include "empty_value_factory.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { Value * ArrayValueFactory::create(Stash & stash) const { @@ -16,4 +15,3 @@ ObjectValueFactory::create(Stash & stash) const { } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.h b/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.h index d9a3dcd99bc..5fc22b31df9 100644 --- a/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.h +++ b/vespalib/src/vespa/vespalib/data/slime/empty_value_factory.h @@ -8,8 +8,7 @@ #include "object_value.h" #include <vespa/vespalib/util/stash.h> -namespace vespalib { -namespace slime { +namespace vespalib::slime { struct NixValueFactory : public ValueFactory { Value *create(Stash &) const override { return NixValue::instance(); } @@ -28,5 +27,3 @@ struct ObjectValueFactory : public ValueFactory { }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/external_memory.cpp b/vespalib/src/vespa/vespalib/data/slime/external_memory.cpp index ebbe833098a..3ffe4102d67 100644 --- a/vespalib/src/vespa/vespalib/data/slime/external_memory.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/external_memory.cpp @@ -4,8 +4,4 @@ namespace vespalib::slime { -ExternalMemory::~ExternalMemory() -{ -} - } // namespace vespalib::slime diff --git a/vespalib/src/vespa/vespalib/data/slime/external_memory.h b/vespalib/src/vespa/vespalib/data/slime/external_memory.h index a1d4510d0c8..aafbb8efcb8 100644 --- a/vespalib/src/vespa/vespalib/data/slime/external_memory.h +++ b/vespalib/src/vespa/vespalib/data/slime/external_memory.h @@ -16,7 +16,7 @@ namespace vespalib::slime { struct ExternalMemory { using UP = std::unique_ptr<ExternalMemory>; virtual Memory get() const = 0; - virtual ~ExternalMemory(); + virtual ~ExternalMemory() = default; }; } // namespace vespalib::slime diff --git a/vespalib/src/vespa/vespalib/data/slime/inject.cpp b/vespalib/src/vespa/vespalib/data/slime/inject.cpp index 7480550ceab..610d0e0041b 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inject.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/inject.cpp @@ -9,8 +9,7 @@ #include <vespa/log/log.h> LOG_SETUP(".vespalib.data.slime.inject"); -namespace vespalib { -namespace slime { +namespace vespalib::slime { namespace { @@ -81,4 +80,3 @@ void inject(const Inspector &inspector, const Inserter &inserter) { } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/inject.h b/vespalib/src/vespa/vespalib/data/slime/inject.h index ee7c9d6c413..e7d67c1f94c 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inject.h +++ b/vespalib/src/vespa/vespalib/data/slime/inject.h @@ -5,8 +5,7 @@ #include "inserter.h" #include "inspector.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Inject a slime sub-structure described by an Inspector into a slime @@ -24,5 +23,4 @@ namespace slime { void inject(const Inspector &inspector, const Inserter &inserter); } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/inserter.cpp b/vespalib/src/vespa/vespalib/data/slime/inserter.cpp index f9d80e74e6f..0042319d8a1 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inserter.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/inserter.cpp @@ -3,8 +3,7 @@ #include "inserter.h" #include "slime.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { using ExtMemUP = ExternalMemory::UP; @@ -48,5 +47,4 @@ Cursor &ObjectInserter::insertData(ExtMemUP value) const { return cursor.setData Cursor &ObjectInserter::insertArray() const { return cursor.setArray(name); } Cursor &ObjectInserter::insertObject() const { return cursor.setObject(name); } -} // namespace slime -} // namespace vespalib +} // namespace vespalib::slime diff --git a/vespalib/src/vespa/vespalib/data/slime/inserter.h b/vespalib/src/vespa/vespalib/data/slime/inserter.h index e23c7ea7ec0..8206e67a79a 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inserter.h +++ b/vespalib/src/vespa/vespalib/data/slime/inserter.h @@ -7,11 +7,9 @@ #include "symbol.h" #include "external_memory.h" -namespace vespalib { +namespace vespalib { class Slime; } -class Slime; - -namespace slime { +namespace vespalib::slime { struct Cursor; @@ -98,6 +96,4 @@ struct ObjectInserter : Inserter { Cursor &insertObject() const override; }; -} // namespace slime -} // namespace vespalib - +} // namespace vespalib::slime diff --git a/vespalib/src/vespa/vespalib/data/slime/inspector.cpp b/vespalib/src/vespa/vespalib/data/slime/inspector.cpp index fe03e2f8ed3..b4e4118f74d 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inspector.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/inspector.cpp @@ -5,8 +5,7 @@ #include "array_traverser.h" #include <cassert> -namespace vespalib { -namespace slime { +namespace vespalib::slime { class Equal { public: @@ -91,4 +90,3 @@ std::ostream & operator << (std::ostream & os, const Inspector & inspector) } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/inspector.h b/vespalib/src/vespa/vespalib/data/slime/inspector.h index fdedead3a7a..1d8250785d2 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inspector.h +++ b/vespalib/src/vespa/vespalib/data/slime/inspector.h @@ -6,8 +6,7 @@ #include "symbol.h" #include <vespa/vespalib/data/memory.h> -namespace vespalib { -namespace slime { +namespace vespalib::slime { struct ArrayTraverser; struct ObjectSymbolTraverser; @@ -44,5 +43,3 @@ std::ostream & operator << (std::ostream & os, const Inspector & inspector); } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/json_format.h b/vespalib/src/vespa/vespalib/data/slime/json_format.h index dca77780e09..e12aa452a98 100644 --- a/vespalib/src/vespa/vespalib/data/slime/json_format.h +++ b/vespalib/src/vespa/vespalib/data/slime/json_format.h @@ -7,11 +7,9 @@ #include <vespa/vespalib/data/input_reader.h> #include <vespa/vespalib/data/output_writer.h> -namespace vespalib { +namespace vespalib { class Slime; } -class Slime; - -namespace slime { +namespace vespalib::slime { struct Inspector; @@ -23,5 +21,3 @@ struct JsonFormat { }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.cpp b/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.cpp index 9d6533a62b7..6bc7f41f626 100644 --- a/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.cpp @@ -2,8 +2,6 @@ #include "named_symbol_inserter.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.h b/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.h index 26f44a4bce0..aac35b2e386 100644 --- a/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.h +++ b/vespalib/src/vespa/vespalib/data/slime/named_symbol_inserter.h @@ -5,8 +5,7 @@ #include "symbol_inserter.h" #include "symbol_table.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Class used to insert the name of a field into a symbol table. @@ -26,5 +25,4 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.cpp b/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.cpp index ef3e897a085..0abec18b118 100644 --- a/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.cpp @@ -2,8 +2,6 @@ #include "named_symbol_lookup.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.h b/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.h index 829df9e55d8..9027625dd9d 100644 --- a/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.h +++ b/vespalib/src/vespa/vespalib/data/slime/named_symbol_lookup.h @@ -5,8 +5,7 @@ #include "symbol_lookup.h" #include "symbol_table.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Class used to look up the name of a field in a symbol table. @@ -26,5 +25,3 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/nix_value.cpp b/vespalib/src/vespa/vespalib/data/slime/nix_value.cpp index 6b337938cbd..1d291e66059 100644 --- a/vespalib/src/vespa/vespalib/data/slime/nix_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/nix_value.cpp @@ -2,11 +2,9 @@ #include "nix_value.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { NixValue NixValue::_invalid; NixValue NixValue::_instance; } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/nix_value.h b/vespalib/src/vespa/vespalib/data/slime/nix_value.h index 182fad227ec..0524e39507e 100644 --- a/vespalib/src/vespa/vespalib/data/slime/nix_value.h +++ b/vespalib/src/vespa/vespalib/data/slime/nix_value.h @@ -4,8 +4,7 @@ #include "value.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Class representing a value containing absolutely nothing. @@ -23,5 +22,3 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/object_traverser.cpp b/vespalib/src/vespa/vespalib/data/slime/object_traverser.cpp index b54eb198569..bf14de368fc 100644 --- a/vespalib/src/vespa/vespalib/data/slime/object_traverser.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/object_traverser.cpp @@ -2,8 +2,6 @@ #include "object_traverser.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/object_traverser.h b/vespalib/src/vespa/vespalib/data/slime/object_traverser.h index b06cd5c824a..e59cb911a74 100644 --- a/vespalib/src/vespa/vespalib/data/slime/object_traverser.h +++ b/vespalib/src/vespa/vespalib/data/slime/object_traverser.h @@ -4,8 +4,7 @@ #include "inspector.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { class Symbol; @@ -28,5 +27,3 @@ struct ObjectTraverser { }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/object_value.cpp b/vespalib/src/vespa/vespalib/data/slime/object_value.cpp index f3d3720fde5..f3436ac0978 100644 --- a/vespalib/src/vespa/vespalib/data/slime/object_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/object_value.cpp @@ -7,8 +7,7 @@ #include "named_symbol_lookup.h" #include "named_symbol_inserter.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { Cursor & ObjectValue::setLeaf(Symbol sym, const ValueFactory &input) { @@ -77,4 +76,3 @@ Symbol ObjectValue::resolve(Memory symbol_name) { return _symbolTable.insert(symbol_name); } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.cpp b/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.cpp index cf6dace40fd..f3a733d7164 100644 --- a/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.cpp @@ -2,8 +2,6 @@ #include "resolved_symbol.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.h b/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.h index 9ca1ed423f6..2b8c39708c9 100644 --- a/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.h +++ b/vespalib/src/vespa/vespalib/data/slime/resolved_symbol.h @@ -5,8 +5,7 @@ #include "symbol_lookup.h" #include "symbol_inserter.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Class containing the pre-resolved symbol for a field. Since the @@ -31,5 +30,3 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/root_value.cpp b/vespalib/src/vespa/vespalib/data/slime/root_value.cpp index 9b175b72cf0..d99fc90fdee 100644 --- a/vespalib/src/vespa/vespalib/data/slime/root_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/root_value.cpp @@ -2,8 +2,6 @@ #include "root_value.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/root_value.h b/vespalib/src/vespa/vespalib/data/slime/root_value.h index bd3f5039132..314b386de6e 100644 --- a/vespalib/src/vespa/vespalib/data/slime/root_value.h +++ b/vespalib/src/vespa/vespalib/data/slime/root_value.h @@ -6,8 +6,7 @@ #include "object_value.h" #include "value_factory.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { class RootValue { @@ -45,5 +44,3 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/strfmt.cpp b/vespalib/src/vespa/vespalib/data/slime/strfmt.cpp index 487badfabf8..d0dd14e94f9 100644 --- a/vespalib/src/vespa/vespalib/data/slime/strfmt.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/strfmt.cpp @@ -5,8 +5,7 @@ #include <stdio.h> #include <cassert> -namespace vespalib { -namespace slime { +namespace vespalib::slime { std::string strfmt(const char *fmt, ...) { @@ -25,4 +24,3 @@ std::string strfmt(const char *fmt, ...) } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/strfmt.h b/vespalib/src/vespa/vespalib/data/slime/strfmt.h index ed84ee35d25..367491adff5 100644 --- a/vespalib/src/vespa/vespalib/data/slime/strfmt.h +++ b/vespalib/src/vespa/vespalib/data/slime/strfmt.h @@ -4,8 +4,7 @@ #include <string> -namespace vespalib { -namespace slime { +namespace vespalib::slime { extern std::string strfmt(const char *fmt, ...) #ifdef __GNUC__ @@ -15,5 +14,3 @@ extern std::string strfmt(const char *fmt, ...) ; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/symbol.cpp b/vespalib/src/vespa/vespalib/data/slime/symbol.cpp index c45f358102b..73000ae6b91 100644 --- a/vespalib/src/vespa/vespalib/data/slime/symbol.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/symbol.cpp @@ -2,8 +2,6 @@ #include "symbol.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/symbol.h b/vespalib/src/vespa/vespalib/data/slime/symbol.h index 93dd0d9b69a..77620f3ff92 100644 --- a/vespalib/src/vespa/vespalib/data/slime/symbol.h +++ b/vespalib/src/vespa/vespalib/data/slime/symbol.h @@ -2,10 +2,9 @@ #pragma once -#include <stdint.h> +#include <cstdint> -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * A Symbol may be used to look up a field within an OBJECT. @@ -27,5 +26,3 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.cpp b/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.cpp index 583685ec92b..2cb3e2daa70 100644 --- a/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.cpp @@ -2,8 +2,6 @@ #include "symbol_inserter.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.h b/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.h index 0a3fa55ef27..3d993988f84 100644 --- a/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.h +++ b/vespalib/src/vespa/vespalib/data/slime/symbol_inserter.h @@ -4,8 +4,7 @@ #include "symbol.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Interface used to obtain the symbol for a field, and insert it into @@ -17,5 +16,4 @@ struct SymbolInserter { }; } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.cpp b/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.cpp index fbcb18367b0..c29b8b0bfa6 100644 --- a/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.cpp @@ -2,8 +2,6 @@ #include "symbol_lookup.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.h b/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.h index 787430c305b..8e8c531b1c7 100644 --- a/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.h +++ b/vespalib/src/vespa/vespalib/data/slime/symbol_lookup.h @@ -4,17 +4,14 @@ #include "symbol.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Interface used to look up the symbol for a field. **/ struct SymbolLookup { virtual Symbol lookup() const = 0; - virtual ~SymbolLookup() {} + virtual ~SymbolLookup() = default; }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/type.cpp b/vespalib/src/vespa/vespalib/data/slime/type.cpp index 5a36537c91f..fba7836ab16 100644 --- a/vespalib/src/vespa/vespalib/data/slime/type.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/type.cpp @@ -2,8 +2,7 @@ #include "type.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { template<int T> const uint32_t TypeType<T>::ID; template<int T> const TypeType<T> TypeType<T>::instance; @@ -18,4 +17,3 @@ template struct TypeType<ARRAY::ID>; template struct TypeType<OBJECT::ID>; } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/type.h b/vespalib/src/vespa/vespalib/data/slime/type.h index e9699fe5a70..b508a59d14e 100644 --- a/vespalib/src/vespa/vespalib/data/slime/type.h +++ b/vespalib/src/vespa/vespalib/data/slime/type.h @@ -2,10 +2,9 @@ #pragma once -#include <stdint.h> +#include <cstdint> -namespace vespalib { -namespace slime { +namespace vespalib::slime { /** * Enumeration of slime data types. @@ -50,5 +49,3 @@ extern template struct TypeType<ARRAY::ID>; extern template struct TypeType<OBJECT::ID>; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/value.cpp b/vespalib/src/vespa/vespalib/data/slime/value.cpp index 2eae660f431..300eeba47e5 100644 --- a/vespalib/src/vespa/vespalib/data/slime/value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/value.cpp @@ -9,8 +9,7 @@ #include <vespa/vespalib/data/simple_buffer.h> #include "json_format.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { bool Value::valid() const { @@ -148,4 +147,3 @@ Symbol Value::resolve(Memory) { return Symbol(); } } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/value.h b/vespalib/src/vespa/vespalib/data/slime/value.h index eaf14829ed9..786f2bede91 100644 --- a/vespalib/src/vespa/vespalib/data/slime/value.h +++ b/vespalib/src/vespa/vespalib/data/slime/value.h @@ -5,8 +5,7 @@ #include "type.h" #include "cursor.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { class SymbolTable; struct SymbolLookup; @@ -85,5 +84,3 @@ public: }; } // namespace vespalib::slime -} // namespace vespalib - diff --git a/vespalib/src/vespa/vespalib/data/slime/value_factory.cpp b/vespalib/src/vespa/vespalib/data/slime/value_factory.cpp index e7b0b6de539..70088e8ca80 100644 --- a/vespalib/src/vespa/vespalib/data/slime/value_factory.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/value_factory.cpp @@ -2,8 +2,6 @@ #include "value_factory.h" -namespace vespalib { -namespace slime { +namespace vespalib::slime { } // namespace vespalib::slime -} // namespace vespalib diff --git a/vespalib/src/vespa/vespalib/data/slime/value_factory.h b/vespalib/src/vespa/vespalib/data/slime/value_factory.h index 1901e7006cb..484246cf9e7 100644 --- a/vespalib/src/vespa/vespalib/data/slime/value_factory.h +++ b/vespalib/src/vespa/vespalib/data/slime/value_factory.h @@ -2,11 +2,9 @@ #pragma once -namespace vespalib { +namespace vespalib { class Stash; } -class Stash; - -namespace slime { +namespace vespalib::slime { class Value; @@ -20,5 +18,3 @@ struct ValueFactory { }; } // namespace vespalib::slime -} // namespace vespalib - |