aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirst@yahooinc.com>2022-09-26 21:46:19 +0200
committerGitHub <noreply@github.com>2022-09-26 21:46:19 +0200
commit373eac0314d2c916c6203d49474cf5adaa775b1c (patch)
tree6830641f9a8d4c2ac7669d56f2af9cae43a5ca34
parentbbc79e913fce52a52c76c3427d5d655e59955acf (diff)
parentc20078d053880d141d4f0e6aebb211dabc6e5895 (diff)
Merge pull request #24226 from vespa-engine/toregge/normalize-includes-for-btreeinserter-and-btreeremover
Normalize includes for btreeinserter.cpp, btreeremover.cpp and btreer…
-rw-r--r--vespalib/src/vespa/vespalib/btree/btreeinserter.cpp3
-rw-r--r--vespalib/src/vespa/vespalib/btree/btreeinserter.hpp1
-rw-r--r--vespalib/src/vespa/vespalib/btree/btreeremover.cpp3
-rw-r--r--vespalib/src/vespa/vespalib/btree/btreeremover.hpp1
-rw-r--r--vespalib/src/vespa/vespalib/btree/btreeroot.cpp4
5 files changed, 1 insertions, 11 deletions
diff --git a/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp b/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp
index 5807c249fdb..70c8647e5d7 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.cpp
@@ -1,8 +1,5 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include "btreeinserter.h"
-#include "btreenodeallocator.h"
-#include "btreerootbase.hpp"
#include "btreeinserter.hpp"
#include "btreenode.hpp"
diff --git a/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp b/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp
index de6454f8bae..468793325f8 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeinserter.hpp
@@ -5,7 +5,6 @@
#include "btreeinserter.h"
#include "btreerootbase.hpp"
#include "btreeiterator.hpp"
-#include <vespa/vespalib/stllike/asciistream.h>
namespace vespalib::btree {
diff --git a/vespalib/src/vespa/vespalib/btree/btreeremover.cpp b/vespalib/src/vespa/vespalib/btree/btreeremover.cpp
index d39b5fd3ea2..eb9bdfa6f7b 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeremover.cpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeremover.cpp
@@ -1,8 +1,5 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include "btreeremover.h"
-#include "btreenodeallocator.h"
-#include "btreerootbase.hpp"
#include "btreeremover.hpp"
#include "btreenode.hpp"
diff --git a/vespalib/src/vespa/vespalib/btree/btreeremover.hpp b/vespalib/src/vespa/vespalib/btree/btreeremover.hpp
index 24155abcff9..faefaff270f 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeremover.hpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeremover.hpp
@@ -4,7 +4,6 @@
#include "btreeremover.h"
#include "btreerootbase.hpp"
-#include <vespa/vespalib/stllike/asciistream.h>
namespace vespalib::btree {
diff --git a/vespalib/src/vespa/vespalib/btree/btreeroot.cpp b/vespalib/src/vespa/vespalib/btree/btreeroot.cpp
index bead7d7bd47..20d00422b29 100644
--- a/vespalib/src/vespa/vespalib/btree/btreeroot.cpp
+++ b/vespalib/src/vespa/vespalib/btree/btreeroot.cpp
@@ -1,9 +1,7 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include "btreeroot.h"
-#include "btreenodeallocator.h"
-#include "btreeiterator.hpp"
#include "btreeroot.hpp"
+#include "btreeiterator.hpp"
#include "btreenode.hpp"
namespace vespalib::btree {