summaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-02-21 21:59:31 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-02-21 21:59:31 +0000
commita17a14c9a1a3f683442f3d5ce74bc55767a48d4c (patch)
tree490b8765f5de5ef20490e8d7afb8a281e932be89 /staging_vespalib
parenteaaeaf82d016ed8edd081bc63faafaa756aa35fe (diff)
string.h does not need alloc.h
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp1
-rw-r--r--staging_vespalib/src/vespa/vespalib/objects/object2slime.h1
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h2
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/jsonwriter.h3
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/programoptions.h1
-rw-r--r--staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp1
6 files changed, 7 insertions, 2 deletions
diff --git a/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp b/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp
index 5cc8862fc05..929c6e9d966 100644
--- a/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp
+++ b/staging_vespalib/src/tests/singleexecutor/singleexecutor_test.cpp
@@ -4,6 +4,7 @@
#include <vespa/vespalib/util/singleexecutor.h>
#include <vespa/vespalib/util/lambdatask.h>
+#include <vespa/vespalib/util/alloc.h>
#include <atomic>
using namespace vespalib;
diff --git a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h b/staging_vespalib/src/vespa/vespalib/objects/object2slime.h
index c52d5025ca2..7cb7f24b4bf 100644
--- a/staging_vespalib/src/vespa/vespalib/objects/object2slime.h
+++ b/staging_vespalib/src/vespa/vespalib/objects/object2slime.h
@@ -4,6 +4,7 @@
#include "objectvisitor.h"
#include <vector>
+#include <memory>
namespace vespalib {
diff --git a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h
index afbde04fb9b..9347a742e60 100644
--- a/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h
+++ b/staging_vespalib/src/vespa/vespalib/util/growablebytebuffer.h
@@ -1,7 +1,7 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
-#include <vespa/vespalib/util/memory.h>
+#include <vespa/vespalib/util/alloc.h>
#include <vespa/vespalib/stllike/string.h>
namespace vespalib {
diff --git a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h
index 0e9e3e10bc3..eef8a2c0cd8 100644
--- a/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h
+++ b/staging_vespalib/src/vespa/vespalib/util/jsonwriter.h
@@ -1,8 +1,9 @@
// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#pragma once
-#include <vector>
#include <vespa/vespalib/stllike/string.h>
+#include <vector>
+#include <memory>
namespace vespalib {
diff --git a/staging_vespalib/src/vespa/vespalib/util/programoptions.h b/staging_vespalib/src/vespa/vespalib/util/programoptions.h
index 654ca50543e..78ba3a955d0 100644
--- a/staging_vespalib/src/vespa/vespalib/util/programoptions.h
+++ b/staging_vespalib/src/vespa/vespalib/util/programoptions.h
@@ -27,6 +27,7 @@
#include <map>
#include <set>
#include <vector>
+#include <memory>
namespace vespalib {
diff --git a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp
index 96d8f267875..97214c33a07 100644
--- a/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp
+++ b/staging_vespalib/src/vespa/vespalib/util/singleexecutor.cpp
@@ -1,6 +1,7 @@
// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include "singleexecutor.h"
+#include <vespa/vespalib/util/alloc.h>
#include <cassert>
namespace vespalib {