Skip to content

Commit

Permalink
Merge pull request #27276 from vespa-engine/toregge/pass-two-int64-t-…
Browse files Browse the repository at this point in the history
…values-to-std-min

Pass two int64_t values to std::min
  • Loading branch information
baldersheim authored Jun 3, 2023
2 parents f5df9b3 + 4868677 commit f8bae81
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion vespalib/src/vespa/vespalib/testkit/time_bomb.cpp
Original file line number Diff line number Diff line change
@@ -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");

Expand All @@ -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)) {
Expand Down

0 comments on commit f8bae81

Please sign in to comment.