From 1205b1e49be43416e4bf27df141db1983075a7ed Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Thu, 25 Apr 2024 14:44:04 +0000
Subject: Use std::vector

---
 vespalib/src/vespa/vespalib/data/memorydatastore.h | 1 -
 vespalib/src/vespa/vespalib/objects/nbostream.h    | 8 ++------
 vespalib/src/vespa/vespalib/util/rcuvector.h       | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

(limited to 'vespalib/src')

diff --git a/vespalib/src/vespa/vespalib/data/memorydatastore.h b/vespalib/src/vespa/vespalib/data/memorydatastore.h
index 0bf2becf7c3..3682e3629e3 100644
--- a/vespalib/src/vespa/vespalib/data/memorydatastore.h
+++ b/vespalib/src/vespa/vespalib/data/memorydatastore.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <vespa/vespalib/util/alloc.h>
-#include <vespa/vespalib/util/array.h>
 #include <vector>
 #include <mutex>
 
diff --git a/vespalib/src/vespa/vespalib/objects/nbostream.h b/vespalib/src/vespa/vespalib/objects/nbostream.h
index ab02e7c1f05..f66c261ae91 100644
--- a/vespalib/src/vespa/vespalib/objects/nbostream.h
+++ b/vespalib/src/vespa/vespalib/objects/nbostream.h
@@ -107,17 +107,13 @@ public:
     }
 
     template <typename T, typename U>
-    nbostream &
-    operator<<(const std::pair<T, U> &val)
-    {
+    nbostream & operator<<(const std::pair<T, U> &val) {
         *this << val.first << val.second;
         return *this;
     }
 
     template <typename T, typename U>
-    nbostream &
-    operator>>(std::pair<T, U> &val)
-    {
+    nbostream & operator>>(std::pair<T, U> &val) {
         *this >> val.first >> val.second;
         return *this;
     }
diff --git a/vespalib/src/vespa/vespalib/util/rcuvector.h b/vespalib/src/vespa/vespalib/util/rcuvector.h
index dcd3fcd8052..787fb2d00c6 100644
--- a/vespalib/src/vespa/vespalib/util/rcuvector.h
+++ b/vespalib/src/vespa/vespalib/util/rcuvector.h
@@ -19,7 +19,7 @@ class RcuVectorHeld : public GenerationHeldBase
 public:
     RcuVectorHeld(size_t size, T&& data);
 
-    ~RcuVectorHeld();
+    ~RcuVectorHeld() override;
 };
 
 
-- 
cgit v1.2.3