aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-11-07 15:26:09 +0100
committerGitHub <noreply@github.com>2023-11-07 15:26:09 +0100
commitcf44053dcc0c219962ffcd982a16d66aef583ed1 (patch)
tree5c036e6753573b62fa6da45f3a15193878594bed
parentf104fcdbf0bb7aa1c3b976ec7aede0732d505f17 (diff)
parent5f9f14fc0f6b88c35749c5b15093eabeb0fb66b0 (diff)
Merge pull request #29261 from vespa-engine/toregge/use-int64-t-constants
Use int64_t constants.
-rw-r--r--storage/src/vespa/storage/storageserver/mergethrottler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.cpp b/storage/src/vespa/storage/storageserver/mergethrottler.cpp
index b341c676fc9..54a4ddbc780 100644
--- a/storage/src/vespa/storage/storageserver/mergethrottler.cpp
+++ b/storage/src/vespa/storage/storageserver/mergethrottler.cpp
@@ -1355,8 +1355,8 @@ MergeThrottler::set_hw_info_locking(const vespalib::HwInfo& hw_info) {
size_t
MergeThrottler::deduced_memory_limit(const StorServerConfig& cfg) const noexcept {
- const auto min_limit = static_cast<size_t>(std::max(cfg.mergeThrottlingMemoryLimit.autoLowerBoundBytes, 1L));
- const auto max_limit = std::max(static_cast<size_t>(std::max(cfg.mergeThrottlingMemoryLimit.autoUpperBoundBytes, 1L)), min_limit);
+ const auto min_limit = static_cast<size_t>(std::max(cfg.mergeThrottlingMemoryLimit.autoLowerBoundBytes, INT64_C(1)));
+ const auto max_limit = std::max(static_cast<size_t>(std::max(cfg.mergeThrottlingMemoryLimit.autoUpperBoundBytes, INT64_C(1))), min_limit);
const auto mem_scale_factor = std::max(cfg.mergeThrottlingMemoryLimit.autoPhysMemScaleFactor, 0.0);
const auto node_mem = static_cast<double>(_hw_info.memory().sizeBytes());