aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-06-03 10:45:51 +0200
committerGitHub <noreply@github.com>2023-06-03 10:45:51 +0200
commitf8bae81a83fd37fb884633e58c0f55e056bba30f (patch)
tree0a4f3c2a2090a791d442af0bde99884169e84a1f
parentf5df9b3f37742e2ff314c2dfb54af1d99dcdd515 (diff)
parent4868677b8b205324a492f775e7756d4ae88c3f7a (diff)
Merge pull request #27276 from vespa-engine/toregge/pass-two-int64-t-values-to-std-minv8.171.43
Pass two int64_t values to std::min
-rw-r--r--vespalib/src/vespa/vespalib/testkit/time_bomb.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/vespalib/src/vespa/vespalib/testkit/time_bomb.cpp b/vespalib/src/vespa/vespalib/testkit/time_bomb.cpp
index 9d4b2ea30c8..a93baac6589 100644
--- a/vespalib/src/vespa/vespalib/testkit/time_bomb.cpp
+++ b/vespalib/src/vespa/vespalib/testkit/time_bomb.cpp
@@ -1,6 +1,7 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include "time_bomb.h"
+#include <cstdint>
#include <vespa/log/log.h>
LOG_SETUP(".vespalib.testkit.time_bomb");
@@ -14,7 +15,7 @@ void bomb(Gate &gate, vespalib::duration timeout) {
return;
}
}
- size_t countdown = std::min(count_s(timeout), 5l);
+ size_t countdown = std::min(count_s(timeout), INT64_C(5));
while (countdown > 0) {
fprintf(stderr, "...%zu...\n", countdown--);
if (gate.await(1s)) {