diff options
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/tests/explore_modern_cpp/explore_modern_cpp_test.cpp | 1 | ||||
| -rw-r--r-- | vespalib/src/vespa/vespalib/util/bobhash.h | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/vespalib/src/tests/explore_modern_cpp/explore_modern_cpp_test.cpp b/vespalib/src/tests/explore_modern_cpp/explore_modern_cpp_test.cpp index 05703b15641..172ec0acda5 100644 --- a/vespalib/src/tests/explore_modern_cpp/explore_modern_cpp_test.cpp +++ b/vespalib/src/tests/explore_modern_cpp/explore_modern_cpp_test.cpp @@ -1,5 +1,6 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include <vespa/vespalib/testkit/test_kit.h> +#include <functional> TEST("verify how std::function copies lambda closures") { size_t count = 0; diff --git a/vespalib/src/vespa/vespalib/util/bobhash.h b/vespalib/src/vespa/vespalib/util/bobhash.h index bc4fc3876fc..c55f9086801 100644 --- a/vespalib/src/vespa/vespalib/util/bobhash.h +++ b/vespalib/src/vespa/vespalib/util/bobhash.h @@ -101,10 +101,10 @@ public: */ static uint32_t hash(const char *orig_k, - register uint32_t length, - register uint32_t initval) { - register uint32_t a,b,c,len; - register const unsigned char *k; + uint32_t length, + uint32_t initval) { + uint32_t a,b,c,len; + const unsigned char *k; k = reinterpret_cast<const unsigned char *>(orig_k); /* Set up the internal state */ |