refactor: Use std::clamp

diff --git a/src/Config.cpp b/src/Config.cpp
index 5628e7a81bd9a2ad6af7c2db030eca5f35731328..dae998fc0c3bece67221c6c8a6e42e7502d14bc4 100644 (file)
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -925,7 +925,7 @@ Config::set_item(const std::string& key,
     break;
 
   case ConfigItem::limit_multiple:
-    m_limit_multiple = Util::clamp(
+    m_limit_multiple = std::clamp(
       util::value_or_throw<core::Error>(util::parse_double(value)), 0.0, 1.0);
     break;
 

diff --git a/src/Depfile.cpp b/src/Depfile.cpp
index 259006e4da59365108df83e51085974d0ad14de0..7ceccc7e77dcaa5ca4ce3c3a171b01a190f0fde4 100644 (file)
--- a/src/Depfile.cpp
+++ b/src/Depfile.cpp
@@ -26,6 +26,8 @@
 #include <core/exceptions.hpp>
 #include <util/path.hpp>
 
+#include <algorithm>
+
 static inline bool
 is_blank(const std::string& s)
 {

diff --git a/src/Util.cpp b/src/Util.cpp
index 19e147999342dd6814fc240dc221414ec18b58e4..ebb69bf1830c00a76c719f516dc6998406c16828 100644 (file)
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -32,6 +32,8 @@
 #include <util/path.hpp>
 #include <util/string.hpp>
 
+#include <algorithm>
+
 extern "C" {
 #include "third_party/base32hex.h"
 }

diff --git a/src/Util.hpp b/src/Util.hpp
index 28597d49d45bf303fd1a54417f51175c212141fa..8f06d8c8f2992b90b3ed535995da1128ecc8a0d9 100644 (file)
--- a/src/Util.hpp
+++ b/src/Util.hpp
@@ -21,7 +21,6 @@
 #include <Stat.hpp>
 #include <util/Tokenizer.hpp>
 
-#include <algorithm>
 #include <cstdint>
 #include <functional>
 #include <ios>
@@ -79,14 +78,6 @@ big_endian_to_int(const uint8_t* buffer, uint8_t& value)
 // should start with a dot, no extra dot is inserted.
 std::string change_extension(std::string_view path, std::string_view new_ext);
 
-// Return `value` adjusted to not be less than `min` and not more than `max`.
-template<typename T>
-T
-clamp(T value, T min, T max)
-{
-  return std::min(max, std::max(min, value));
-}
-
 // Clone a file from `src` to `dest`. If `via_tmp_file` is true, `src` is cloned
 // to a temporary file and then renamed to `dest`. Throws `core::Error` on
 // error.

diff --git a/src/core/Statistics.cpp b/src/core/Statistics.cpp
index 0f6c045621d7bc68c6482ade683ca0ef25badf16..4105d4e3684066edfa3e06a5337230f73c30cd41 100644 (file)
--- a/src/core/Statistics.cpp
+++ b/src/core/Statistics.cpp
@@ -25,6 +25,8 @@
 #include <util/TextTable.hpp>
 #include <util/string.hpp>
 
+#include <algorithm>
+
 namespace core {
 
 using core::Statistic;

diff --git a/src/core/mainoptions.cpp b/src/core/mainoptions.cpp
index b7466c8444a9a4a997e936daa45caf93cb6f0f04..609fdb55f35547c1919bdcc2ae51d7a984808759 100644 (file)
--- a/src/core/mainoptions.cpp
+++ b/src/core/mainoptions.cpp
@@ -44,6 +44,7 @@
 
 #include <fcntl.h>
 
+#include <algorithm>
 #include <optional>
 #include <string>
 

diff --git a/unittest/test_Util.cpp b/unittest/test_Util.cpp
index 39eafaa0905063977e251f60ce60d146102bef7c..821c7d2e363d368ca828df6e362ca5cd3ca63af8 100644 (file)
--- a/unittest/test_Util.cpp
+++ b/unittest/test_Util.cpp
@@ -104,18 +104,6 @@ TEST_CASE("Util::change_extension")
   CHECK(Util::change_extension("foo.bar.txt", ".o") == "foo.bar.o");
 }
 
-TEST_CASE("Util::clamp")
-{
-  CHECK(Util::clamp(0, 1, 2) == 1);
-  CHECK(Util::clamp(1, 1, 2) == 1);
-  CHECK(Util::clamp(2, 1, 2) == 2);
-  CHECK(Util::clamp(3, 1, 2) == 2);
-
-  CHECK(Util::clamp(7.0, 7.7, 8.8) == Approx(7.7));
-  CHECK(Util::clamp(8.0, 7.7, 8.8) == Approx(8.0));
-  CHECK(Util::clamp(9.0, 7.7, 8.8) == Approx(8.8));
-}
-
 TEST_CASE("Util::common_dir_prefix_length")
 {
   CHECK(Util::common_dir_prefix_length("", "") == 0);

diff --git a/unittest/test_storage_primary_util.cpp b/unittest/test_storage_primary_util.cpp
index b847075d96e247f803eeac99e7cb082cb5b7fb0b..58d2742e1fc39337c63b8b0a7d0421e0d471c95e 100644 (file)
--- a/unittest/test_storage_primary_util.cpp
+++ b/unittest/test_storage_primary_util.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2021 Joel Rosdahl and other contributors
+// Copyright (C) 2021-2022 Joel Rosdahl and other contributors
 //
 // See doc/AUTHORS.adoc for a complete list of contributors.
 //
@@ -23,6 +23,7 @@
 
 #include <third_party/doctest.h>
 
+#include <algorithm>
 #include <string>
 
 using TestUtil::TestContext;