Prefer std::vector over vespalib::Array

2 files changed, 1 insertions, 6 deletions

diff --git a/vespalib/src/vespa/vespalib/util/arrayref.h b/vespalib/src/vespa/vespalib/util/arrayref.h
index cbfea3c21bd..88dc501370c 100644
--- a/vespalib/src/vespa/vespalib/util/arrayref.h
+++ b/vespalib/src/vespa/vespalib/util/arrayref.h
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include "array.h"
 #include "small_vector.h"
 #include <vector>
 
@@ -20,7 +19,6 @@ public:
     ArrayRef(std::vector<T, A> & v) noexcept : _v(v.data()), _sz(v.size()) { }
     template<size_t N>
     ArrayRef(SmallVector<T, N> &v) noexcept :  _v(v.data()), _sz(v.size()) { }
-    ArrayRef(Array<T> &v) noexcept : _v(v.data()), _sz(v.size()) { }
     T & operator [] (size_t i) noexcept { return _v[i]; }
     const T & operator [] (size_t i) const noexcept { return _v[i]; }
     T * data() noexcept { return _v; }
@@ -43,7 +41,6 @@ public:
     template<size_t N>
     ConstArrayRef(const SmallVector<T, N> &v) noexcept :  _v(v.data()), _sz(v.size()) { }
     ConstArrayRef(const ArrayRef<T> & v) noexcept : _v(v.data()), _sz(v.size()) { }
-    ConstArrayRef(const Array<T> &v) noexcept : _v(v.data()), _sz(v.size()) { }
     constexpr ConstArrayRef() noexcept : _v(nullptr), _sz(0) {}
     const T & operator [] (size_t i) const noexcept { return _v[i]; }
     [[nodiscard]] size_t size() const noexcept { return _sz; }
diff --git a/vespalib/src/vespa/vespalib/util/small_vector.h b/vespalib/src/vespa/vespalib/util/small_vector.h
index 54711623440..cf9910e24b5 100644
--- a/vespalib/src/vespa/vespalib/util/small_vector.h
+++ b/vespalib/src/vespa/vespalib/util/small_vector.h
@@ -4,10 +4,8 @@
 
 #include "alloc.h"
 #include "traits.h"
-#include <string.h>
-#include <cstdint>
+#include <cstring>
 #include <cassert>
-#include <memory>
 #include <iterator>
 
 namespace vespalib {