sync to p-ranav/argparse@fd13c28

JiauZhang · Sep 8, 2024 · 6d259ee · 6d259ee
1 parent 0a7d763
commit 6d259ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.gitpicker.json b/.gitpicker.json
@@ -54,7 +54,7 @@
     {
         "user": "p-ranav",
         "repo": "argparse",
-        "branch": "8a7fa1899822947f7553921f7bcec12d8d0f89a7",
+        "branch": "fd13c2859131ab463e617a5a8abcc69eb7e1d897",
         "data": [
             {
                 "root": "include/argparse",

diff --git a/argparse.hpp b/argparse.hpp
@@ -550,7 +550,7 @@ std::size_t get_levenshtein_distance(const StringType &s1,
       } else if (s1[i - 1] == s2[j - 1]) {
         dp[i][j] = dp[i - 1][j - 1];
       } else {
-        dp[i][j] = 1 + std::min({dp[i - 1][j], dp[i][j - 1], dp[i - 1][j - 1]});
+        dp[i][j] = 1 + std::min<std::size_t>({dp[i - 1][j], dp[i][j - 1], dp[i - 1][j - 1]});
       }
     }
   }
@@ -562,7 +562,7 @@ template <typename ValueType>
 std::string get_most_similar_string(const std::map<std::string, ValueType> &map,
                                     const std::string &input) {
   std::string most_similar{};
-  std::size_t min_distance = std::numeric_limits<std::size_t>::max();
+  std::size_t min_distance = (std::numeric_limits<std::size_t>::max)();
 
   for (const auto &entry : map) {
     std::size_t distance = get_levenshtein_distance(entry.first, input);
@@ -2057,7 +2057,7 @@ class ArgumentParser {
     std::string curline("Usage: ");
     curline += this->m_program_name;
     const bool multiline_usage =
-        this->m_usage_max_line_width < std::numeric_limits<std::size_t>::max();
+        this->m_usage_max_line_width < (std::numeric_limits<std::size_t>::max)();
     const size_t indent_size = curline.size();
 
     const auto deal_with_options_of_group = [&](std::size_t group_idx) {
@@ -2534,7 +2534,7 @@ class ArgumentParser {
   std::map<std::string, bool> m_subparser_used;
   std::vector<MutuallyExclusiveGroup> m_mutually_exclusive_groups;
   bool m_suppress = false;
-  std::size_t m_usage_max_line_width = std::numeric_limits<std::size_t>::max();
+  std::size_t m_usage_max_line_width = (std::numeric_limits<std::size_t>::max)();
   bool m_usage_break_on_mutex = false;
   int m_usage_newline_counter = 0;
   std::vector<std::string> m_group_names;