diff options
author | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
---|---|---|
committer | bjormel <bjormel@yahooinc.com> | 2023-10-26 13:59:28 +0000 |
commit | 567be9a1f6353cec41c23bfd1fcd46b4b2a4d2d7 (patch) | |
tree | 4664a743e166a5e11aee7b9acd70ad8ee2617612 /eval/src/vespa/eval/eval/value_type.h | |
parent | e9058b555d4dfea2f6c872d9a677e8678b569569 (diff) | |
parent | bce3b8e926bf9da880172acbe1ba4b12d5e026d6 (diff) |
Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller
Diffstat (limited to 'eval/src/vespa/eval/eval/value_type.h')
-rw-r--r-- | eval/src/vespa/eval/eval/value_type.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eval/src/vespa/eval/eval/value_type.h b/eval/src/vespa/eval/eval/value_type.h index 3bdfcbdd980..b35e23ee4e6 100644 --- a/eval/src/vespa/eval/eval/value_type.h +++ b/eval/src/vespa/eval/eval/value_type.h @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #pragma once @@ -49,9 +49,9 @@ private: public: ValueType(ValueType &&) noexcept = default; - ValueType(const ValueType &) = default; + ValueType(const ValueType &); ValueType &operator=(ValueType &&) noexcept = default; - ValueType &operator=(const ValueType &) = default; + ValueType &operator=(const ValueType &); ~ValueType(); CellType cell_type() const { return _cell_type; } CellMeta cell_meta() const { return {_cell_type, is_double()}; } @@ -88,7 +88,7 @@ public: const std::vector<vespalib::string> &to) const; ValueType cell_cast(CellType to_cell_type) const; - static ValueType error_type() { return ValueType(); } + static ValueType error_type() { return {}; } static ValueType make_type(CellType cell_type, std::vector<Dimension> dimensions_in); static ValueType double_type() { return make_type(CellType::DOUBLE, {}); } static ValueType from_spec(const vespalib::string &spec); |