Optimise includes

3 files changed, 23 insertions, 23 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 {