summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHÃ¥kon Hallingstad <hakon@oath.com>2019-02-03 01:39:06 +0100
committerGitHub <noreply@github.com>2019-02-03 01:39:06 +0100
commit5d7a293ecfea21f09d709c6bb1979f3d964d00aa (patch)
treedef4cd1cedef12157eff759cef63105340da34d4 /searchlib
parentfac611ad92dc4025a8c9ffe9e0a7715575d706a9 (diff)
Revert "Use OS provided xxhash."
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/aggregation/aggregation.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/docstore/chunkformats.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/docstore/value.cpp2
-rw-r--r--searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp b/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp
index d40cdd5f13e..2c081328fd1 100644
--- a/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp
+++ b/searchlib/src/vespa/searchlib/aggregation/aggregation.cpp
@@ -5,7 +5,7 @@
#include <vespa/searchlib/expression/resultvector.h>
#include <vespa/document/fieldvalue/document.h>
#include <vespa/vespalib/objects/visit.hpp>
-#include <xxhash.h>
+#include <vespa/vespalib/xxhash/xxhash.h>
using namespace search::expression;
diff --git a/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp b/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp
index 8c32872bcec..32f02359162 100644
--- a/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/chunkformats.cpp
@@ -2,8 +2,8 @@
#include "chunkformats.h"
#include <vespa/vespalib/util/crc.h>
+#include <vespa/vespalib/xxhash/xxhash.h>
#include <vespa/vespalib/util/stringfmt.h>
-#include <xxhash.h>
namespace search {
diff --git a/searchlib/src/vespa/searchlib/docstore/value.cpp b/searchlib/src/vespa/searchlib/docstore/value.cpp
index 68bb060683d..8750413e3bc 100644
--- a/searchlib/src/vespa/searchlib/docstore/value.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/value.cpp
@@ -3,7 +3,7 @@
#include "value.h"
#include <vespa/vespalib/data/databuffer.h>
#include <vespa/vespalib/util/compressor.h>
-#include <xxhash.h>
+#include <vespa/vespalib/xxhash/xxhash.h>
using vespalib::compression::compress;
using vespalib::compression::decompress;
diff --git a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
index 126028c27e9..47ab81f9b2e 100644
--- a/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
+++ b/searchlib/src/vespa/searchlib/transactionlog/domainpart.cpp
@@ -2,11 +2,11 @@
#include "domainpart.h"
#include <vespa/vespalib/util/crc.h>
+#include <vespa/vespalib/xxhash/xxhash.h>
#include <vespa/vespalib/util/stringfmt.h>
#include <vespa/vespalib/data/fileheader.h>
#include <vespa/searchlib/common/fileheadercontext.h>
#include <vespa/fastlib/io/bufferedfile.h>
-#include <xxhash.h>
#include <vespa/log/log.h>
LOG_SETUP(".transactionlog.domainpart");