diff options
author | HÃ¥vard Pettersen <havardpe@gmail.com> | 2017-03-30 15:37:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-30 15:37:36 +0200 |
commit | 7b478602d33afdfb53f5c95e880db14f02b3707f (patch) | |
tree | d1193254eb49cfc05cf597d4d82ea77e7b0942c7 /document | |
parent | 8ba178cec0ea2cafa912a3e27373e9ebdfd6fcee (diff) | |
parent | f371a3f68e1b0418d98b805420954e1319afdde7 (diff) |
Merge pull request #2086 from yahoo/balder/remove-lp-3-rebased
Balder/remove lp 3 rebased
Diffstat (limited to 'document')
-rw-r--r-- | document/src/vespa/document/fieldvalue/fieldvalue.h | 6 | ||||
-rw-r--r-- | document/src/vespa/document/fieldvalue/mapfieldvalue.cpp | 4 |
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"); |