From 5d7a293ecfea21f09d709c6bb1979f3d964d00aa Mon Sep 17 00:00:00 2001
From: Håkon Hallingstad <hakon@oath.com>
Date: Sun, 3 Feb 2019 01:39:06 +0100
Subject: Revert "Use OS provided xxhash."

---
 eval/src/vespa/eval/tensor/sparse/CMakeLists.txt           |  1 -
 .../vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp | 14 --------------
 .../vespa/eval/tensor/sparse/sparse_tensor_address_ref.h   |  3 ++-
 3 files changed, 2 insertions(+), 16 deletions(-)
 delete mode 100644 eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp

(limited to 'eval/src')

diff --git a/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt b/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
index 73d21ef7b8f..4cd682d8953 100644
--- a/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
+++ b/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_library(eval_tensor_sparse OBJECT
     sparse_tensor_address_combiner.cpp
     sparse_tensor_address_padder.cpp
     sparse_tensor_address_reducer.cpp
-    sparse_tensor_address_ref.cpp
     sparse_tensor_match.cpp
     sparse_tensor_builder.cpp
     sparse_tensor_unsorted_address_builder.cpp
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp
deleted file mode 100644
index ba40e37488e..00000000000
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2019 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "sparse_tensor_address_ref.h"
-#include <xxhash.h>
-
-namespace vespalib::tensor {
-
-uint32_t
-SparseTensorAddressRef::calcHash() const {
-    return XXH32(_start, _size, 0);
-}
-
-}
-
diff --git a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h
index 743a46d63e1..8533aa29829 100644
--- a/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h
+++ b/eval/src/vespa/eval/tensor/sparse/sparse_tensor_address_ref.h
@@ -3,6 +3,7 @@
 #pragma once
 
 #include <vespa/vespalib/util/stash.h>
+#include <vespa/vespalib/xxhash/xxhash.h>
 #include <cstring>
 
 namespace vespalib::tensor {
@@ -40,7 +41,7 @@ public:
 
     uint32_t hash() const { return _hash; }
 
-    uint32_t calcHash() const;
+    uint32_t calcHash() const { return XXH32(_start, _size, 0); }
 
     bool operator<(const SparseTensorAddressRef &rhs) const {
         size_t minSize = std::min(_size, rhs._size);
-- 
cgit v1.2.3