diff options
6 files changed, 28 insertions, 31 deletions
diff --git a/staging_vespalib/src/vespa/vespalib/objects/deserializer.h b/staging_vespalib/src/vespa/vespalib/objects/deserializer.h index e25e08e67c9..1a01f9a68d6 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/deserializer.h +++ b/staging_vespalib/src/vespa/vespalib/objects/deserializer.h @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/vespalib/objects/fieldbase.h> +#include "fieldbase.h" #include <vespa/vespalib/util/array.h> #include <vector> -#include <stdint.h> +#include <cstdint> namespace vespalib { diff --git a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h b/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h index 9288757508e..cfaa940f83d 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h +++ b/staging_vespalib/src/vespa/vespalib/objects/nboserializer.h @@ -1,8 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/vespalib/objects/serializer.h> -#include <vespa/vespalib/objects/deserializer.h> +#include "serializer.h" +#include "deserializer.h" namespace vespalib { @@ -11,23 +11,23 @@ class nbostream; class NBOSerializer : public Serializer, public Deserializer { public: NBOSerializer(nbostream &stream) : _stream(stream) { } - virtual NBOSerializer &put(const IFieldBase &field, bool value); - virtual NBOSerializer &put(const IFieldBase &field, uint8_t value); - virtual NBOSerializer &put(const IFieldBase &field, uint16_t value); - virtual NBOSerializer &put(const IFieldBase &field, uint32_t value); - virtual NBOSerializer &put(const IFieldBase &field, uint64_t value); - virtual NBOSerializer &put(const IFieldBase &field, float value); - virtual NBOSerializer &put(const IFieldBase &field, double value); - virtual NBOSerializer &put(const IFieldBase &field, const stringref &val); - - virtual NBOSerializer &get(const IFieldBase &field, bool &value); - virtual NBOSerializer &get(const IFieldBase &field, uint8_t &value); - virtual NBOSerializer &get(const IFieldBase &field, uint16_t &value); - virtual NBOSerializer &get(const IFieldBase &field, uint32_t &value); - virtual NBOSerializer &get(const IFieldBase &field, uint64_t &value); - virtual NBOSerializer &get(const IFieldBase &field, double &value); - virtual NBOSerializer &get(const IFieldBase &field, float &value); - virtual NBOSerializer &get(const IFieldBase &field, string &value); + NBOSerializer &put(const IFieldBase &field, bool value) override; + NBOSerializer &put(const IFieldBase &field, uint8_t value) override; + NBOSerializer &put(const IFieldBase &field, uint16_t value) override; + NBOSerializer &put(const IFieldBase &field, uint32_t value) override; + NBOSerializer &put(const IFieldBase &field, uint64_t value) override; + NBOSerializer &put(const IFieldBase &field, float value) override; + NBOSerializer &put(const IFieldBase &field, double value) override; + NBOSerializer &put(const IFieldBase &field, const stringref &val) override; + + NBOSerializer &get(const IFieldBase &field, bool &value) override; + NBOSerializer &get(const IFieldBase &field, uint8_t &value) override; + NBOSerializer &get(const IFieldBase &field, uint16_t &value) override; + NBOSerializer &get(const IFieldBase &field, uint32_t &value) override; + NBOSerializer &get(const IFieldBase &field, uint64_t &value) override; + NBOSerializer &get(const IFieldBase &field, double &value) override; + NBOSerializer &get(const IFieldBase &field, float &value) override; + NBOSerializer &get(const IFieldBase &field, string &value) override; const char *peek() const; diff --git a/staging_vespalib/src/vespa/vespalib/objects/serializer.h b/staging_vespalib/src/vespa/vespalib/objects/serializer.h index 5e67b968946..fae4c8df66d 100644 --- a/staging_vespalib/src/vespa/vespalib/objects/serializer.h +++ b/staging_vespalib/src/vespa/vespalib/objects/serializer.h @@ -1,10 +1,10 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once -#include <vespa/vespalib/objects/fieldbase.h> +#include "fieldbase.h" #include <vespa/vespalib/util/array.h> #include <vector> -#include <stdint.h> +#include <cstdint> 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 2d0f9ce0f54..8f7d8ef77f8 100644 --- a/vespalib/src/vespa/vespalib/data/slime/array_value.cpp +++ b/vespalib/src/vespa/vespalib/data/slime/array_value.cpp @@ -3,7 +3,6 @@ #include "array_value.h" #include "array_traverser.h" #include "empty_value_factory.h" -#include "basic_value_factory.h" namespace vespalib { namespace slime { diff --git a/vespalib/src/vespa/vespalib/data/slime/inspector.h b/vespalib/src/vespa/vespalib/data/slime/inspector.h index 228e14a981b..bb689cb7c7c 100644 --- a/vespalib/src/vespa/vespalib/data/slime/inspector.h +++ b/vespalib/src/vespa/vespalib/data/slime/inspector.h @@ -3,8 +3,8 @@ #pragma once #include "type.h" -#include <vespa/vespalib/data/memory.h> #include "symbol.h" +#include <vespa/vespalib/data/memory.h> namespace vespalib { namespace slime { diff --git a/vespalib/src/vespa/vespalib/data/slime/slime.h b/vespalib/src/vespa/vespalib/data/slime/slime.h index 2ddefb061e6..135f94c0dc6 100644 --- a/vespalib/src/vespa/vespalib/data/slime/slime.h +++ b/vespalib/src/vespa/vespalib/data/slime/slime.h @@ -7,8 +7,6 @@ #include "basic_value.h" #include "basic_value_factory.h" #include "binary_format.h" -#include <vespa/vespalib/data/input_reader.h> -#include <vespa/vespalib/data/output_writer.h> #include "convenience.h" #include "cursor.h" #include "empty_value_factory.h" @@ -16,16 +14,13 @@ #include "inserter.h" #include "inspector.h" #include "json_format.h" -#include <vespa/vespalib/data/memory.h> #include "named_symbol_inserter.h" #include "named_symbol_lookup.h" #include "nix_value.h" #include "object_traverser.h" #include "object_value.h" -#include <vespa/vespalib/data/output.h> #include "resolved_symbol.h" #include "root_value.h" -#include <vespa/vespalib/data/simple_buffer.h> #include "symbol.h" #include "symbol_inserter.h" #include "symbol_lookup.h" @@ -33,7 +28,10 @@ #include "type.h" #include "value.h" #include "value_factory.h" -#include <memory> +#include <vespa/vespalib/data/input_reader.h> +#include <vespa/vespalib/data/output_writer.h> +#include <vespa/vespalib/data/simple_buffer.h> +#include <vespa/vespalib/data/output.h> namespace vespalib { |