summaryrefslogtreecommitdiffstats
path: root/staging_vespalib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2016-12-15 03:17:19 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2016-12-15 13:12:36 +0100
commit1c63902ae04edc5335f6162ea8c20a63c0e3d298 (patch)
tree6cd83174ac41d31df4f0e9246b4de6767766b3b0 /staging_vespalib
parent2a85dc3fd5af5c33601cf04ead06c7545fa46d75 (diff)
Make it compile with gcc 6
Diffstat (limited to 'staging_vespalib')
-rw-r--r--staging_vespalib/src/tests/array/allocinarray_benchmark.cpp1
-rw-r--r--staging_vespalib/src/tests/array/sort_benchmark.cpp2
-rw-r--r--staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.h1
3 files changed, 3 insertions, 1 deletions
diff --git a/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp b/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp
index 426cb7ee3b8..bb23c7183b2 100644
--- a/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp
+++ b/staging_vespalib/src/tests/array/allocinarray_benchmark.cpp
@@ -4,6 +4,7 @@
#include <vespa/vespalib/util/rusage.h>
#include <vespa/vespalib/util/optimized.h>
#include <vespa/vespalib/util/allocinarray.h>
+#include <vespa/vespalib/util/array.hpp>
#include <vespa/log/log.h>
LOG_SETUP("allocinarray_benchmark");
diff --git a/staging_vespalib/src/tests/array/sort_benchmark.cpp b/staging_vespalib/src/tests/array/sort_benchmark.cpp
index bb304f92d58..525eb4d3427 100644
--- a/staging_vespalib/src/tests/array/sort_benchmark.cpp
+++ b/staging_vespalib/src/tests/array/sort_benchmark.cpp
@@ -2,7 +2,7 @@
#include <vespa/fastos/fastos.h>
#include <vespa/vespalib/testkit/testapp.h>
#include <vespa/vespalib/util/rusage.h>
-#include <vespa/vespalib/util/array.h>
+#include <vespa/vespalib/util/array.hpp>
#include <vespa/log/log.h>
LOG_SETUP("sort_benchmark");
diff --git a/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.h b/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.h
index 747dfcacc56..be16b1de5e2 100644
--- a/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.h
+++ b/staging_vespalib/src/vespa/vespalib/stllike/lrucache_map.h
@@ -3,6 +3,7 @@
#include <vespa/vespalib/stllike/hashtable.h>
#include <vespa/vespalib/stllike/hash_fun.h>
+#include <vector>
namespace vespalib {