Merge pull request #2086 from yahoo/balder/remove-lp-3-rebased

Balder/remove lp 3 rebased

2 files changed, 3 insertions, 7 deletions

diff --git a/document/src/vespa/document/fieldvalue/fieldvalue.h b/document/src/vespa/document/fieldvalue/fieldvalue.h
index e2557725854..78c8795e412 100644
--- a/document/src/vespa/document/fieldvalue/fieldvalue.h
+++ b/document/src/vespa/document/fieldvalue/fieldvalue.h
@@ -29,9 +29,9 @@ namespace document {
 class FieldValue : public vespalib::Identifiable
 {
 protected:
-    FieldValue(const FieldValue&) { }
-    FieldValue& operator=(const FieldValue&) { return *this; }
-    typedef vespalib::IArrayT<FieldValue> IArray;
+    FieldValue(const FieldValue&) = default;
+    FieldValue& operator=(const FieldValue&) = default;
+    using IArray = vespalib::IArrayT<FieldValue>;
     static IArray::UP createArray(const DataType & baseType);
 
 public:
diff --git a/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp b/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp
index 531a3e5267c..368a903d3cf 100644
--- a/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp
+++ b/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp
@@ -1,12 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "mapfieldvalue.h"
-#include "arrayfieldvalue.h"
 #include "weightedsetfieldvalue.h"
 #include <vespa/document/base/exceptions.h>
-#include <vespa/document/util/bytebuffer.h>
-#include <vespa/document/datatype/arraydatatype.h>
-#include <vespa/vespalib/objects/identifiable.h>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".document.fieldvalue.map");