diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2020-08-18 13:22:44 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2020-08-18 13:22:44 +0200 |
| commit | 299fc4a646961edec9658e641f14e83922f2d753 (patch) | |
| tree | a5214fdad2854cd6fcb21c56246b7c033293a2a2 | |
| parent | 38f5a0ba1768469f848eb88b8d634e40e6e63dbb (diff) | |
Inlining of xxhash is decided globally.
| -rw-r--r-- | build_settings.cmake | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/build_settings.cmake b/build_settings.cmake index 6f6df3de883..1a05ffe5073 100644 --- a/build_settings.cmake +++ b/build_settings.cmake @@ -67,7 +67,7 @@ else() endif() if(VESPA_OS_DISTRO_COMBINED STREQUAL "debian 10") - set(VESPA_XXHASH_DEFINE "-DXXH_NO_INLINE_ALL") + unset(VESPA_XXHASH_DEFINE) else() set(VESPA_XXHASH_DEFINE "-DXXH_INLINE_ALL") endif() diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp index a711b29f7a4..4df2b5e591b 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp @@ -14,11 +14,6 @@ #include <vespa/storageapi/message/stat.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/util/exceptions.h> -#ifndef XXH_NO_INLINE_ALL -#ifndef XXH_INLINE_ALL -# define XXH_INLINE_ALL // Let XXH64 be inlined for fixed hash size (bucket ID) -#endif -#endif #include <xxhash.h> #include <vespa/log/log.h> |