Skip to content

Commit

Permalink
Merge pull request #376 from nick20201/master
Browse files Browse the repository at this point in the history
Updated the min and max to deal with a macro in minwindef.h
  • Loading branch information
p-ranav authored Sep 2, 2024
2 parents 8a7fa18 + df58f9d commit fd13c28
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions include/argparse/argparse.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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]});
}
}
}
Expand All @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit fd13c28

Please sign in to comment.