mirror of
https://github.com/p-ranav/indicators.git
synced 2025-12-16 04:18:51 +08:00
Fix #define min/max problem from Windows.h
This commit is contained in:
@@ -122,7 +122,7 @@ public:
|
|||||||
|
|
||||||
size_t current() {
|
size_t current() {
|
||||||
std::lock_guard<std::mutex> lock{mutex_};
|
std::lock_guard<std::mutex> lock{mutex_};
|
||||||
return std::min(static_cast<size_t>(progress_),
|
return (std::min)(static_cast<size_t>(progress_),
|
||||||
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -179,7 +179,7 @@ private:
|
|||||||
auto elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(now - start_time_point_);
|
auto elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(now - start_time_point_);
|
||||||
|
|
||||||
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
||||||
os << " " << std::min(static_cast<size_t>(progress_ / max_progress * 100.0), size_t(100))
|
os << " " << (std::min)(static_cast<size_t>(progress_ / max_progress * 100.0), size_t(100))
|
||||||
<< "%";
|
<< "%";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ public:
|
|||||||
std::ostream &write(float progress) {
|
std::ostream &write(float progress) {
|
||||||
std::string fill_text{"█"};
|
std::string fill_text{"█"};
|
||||||
std::vector<std::string> lead_characters{" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"};
|
std::vector<std::string> lead_characters{" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"};
|
||||||
auto value = std::min(1.0f, std::max(0.0f, progress / 100.0f));
|
auto value = (std::min)(1.0f, (std::max)(0.0f, progress / 100.0f));
|
||||||
auto whole_width = std::floor(value * bar_width);
|
auto whole_width = std::floor(value * bar_width);
|
||||||
auto remainder_width = fmod((value * bar_width), 1.0f);
|
auto remainder_width = fmod((value * bar_width), 1.0f);
|
||||||
auto part_width = std::floor(remainder_width * lead_characters.size());
|
auto part_width = std::floor(remainder_width * lead_characters.size());
|
||||||
|
|||||||
@@ -166,7 +166,7 @@ public:
|
|||||||
|
|
||||||
size_t current() {
|
size_t current() {
|
||||||
std::lock_guard<std::mutex> lock{mutex_};
|
std::lock_guard<std::mutex> lock{mutex_};
|
||||||
return std::min(
|
return (std::min)(
|
||||||
progress_,
|
progress_,
|
||||||
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
||||||
}
|
}
|
||||||
@@ -231,7 +231,7 @@ private:
|
|||||||
|
|
||||||
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
||||||
os << " "
|
os << " "
|
||||||
<< std::min(static_cast<size_t>(static_cast<float>(progress_) /
|
<< (std::min)(static_cast<size_t>(static_cast<float>(progress_) /
|
||||||
max_progress * 100),
|
max_progress * 100),
|
||||||
size_t(100))
|
size_t(100))
|
||||||
<< "%";
|
<< "%";
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ public:
|
|||||||
|
|
||||||
size_t current() {
|
size_t current() {
|
||||||
std::lock_guard<std::mutex> lock{mutex_};
|
std::lock_guard<std::mutex> lock{mutex_};
|
||||||
return std::min(progress_, size_t(get_value<details::ProgressBarOption::max_progress>()));
|
return (std::min)(progress_, size_t(get_value<details::ProgressBarOption::max_progress>()));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_completed() const { return get_value<details::ProgressBarOption::completed>(); }
|
bool is_completed() const { return get_value<details::ProgressBarOption::completed>(); }
|
||||||
|
|||||||
@@ -2900,7 +2900,7 @@ public:
|
|||||||
std::ostream &write(float progress) {
|
std::ostream &write(float progress) {
|
||||||
std::string fill_text{"█"};
|
std::string fill_text{"█"};
|
||||||
std::vector<std::string> lead_characters{" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"};
|
std::vector<std::string> lead_characters{" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"};
|
||||||
auto value = std::min(1.0f, std::max(0.0f, progress / 100.0f));
|
auto value = (std::min)(1.0f, (std::max)(0.0f, progress / 100.0f));
|
||||||
auto whole_width = std::floor(value * bar_width);
|
auto whole_width = std::floor(value * bar_width);
|
||||||
auto remainder_width = fmod((value * bar_width), 1.0f);
|
auto remainder_width = fmod((value * bar_width), 1.0f);
|
||||||
auto part_width = std::floor(remainder_width * lead_characters.size());
|
auto part_width = std::floor(remainder_width * lead_characters.size());
|
||||||
@@ -3128,7 +3128,7 @@ public:
|
|||||||
std::ostream &write(float progress) {
|
std::ostream &write(float progress) {
|
||||||
std::string fill_text{"█"};
|
std::string fill_text{"█"};
|
||||||
std::vector<std::string> lead_characters{" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"};
|
std::vector<std::string> lead_characters{" ", "▏", "▎", "▍", "▌", "▋", "▊", "▉"};
|
||||||
auto value = std::min(1.0f, std::max(0.0f, progress / 100.0f));
|
auto value = (std::min)(1.0f, (std::max)(0.0f, progress / 100.0f));
|
||||||
auto whole_width = std::floor(value * bar_width);
|
auto whole_width = std::floor(value * bar_width);
|
||||||
auto remainder_width = fmod((value * bar_width), 1.0f);
|
auto remainder_width = fmod((value * bar_width), 1.0f);
|
||||||
auto part_width = std::floor(remainder_width * lead_characters.size());
|
auto part_width = std::floor(remainder_width * lead_characters.size());
|
||||||
@@ -3445,7 +3445,7 @@ public:
|
|||||||
|
|
||||||
size_t current() {
|
size_t current() {
|
||||||
std::lock_guard<std::mutex> lock{mutex_};
|
std::lock_guard<std::mutex> lock{mutex_};
|
||||||
return std::min(
|
return (std::min)(
|
||||||
progress_,
|
progress_,
|
||||||
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
||||||
}
|
}
|
||||||
@@ -3510,7 +3510,7 @@ private:
|
|||||||
|
|
||||||
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
||||||
os << " "
|
os << " "
|
||||||
<< std::min(static_cast<size_t>(static_cast<float>(progress_) /
|
<< (std::min)(static_cast<size_t>(static_cast<float>(progress_) /
|
||||||
max_progress * 100),
|
max_progress * 100),
|
||||||
size_t(100))
|
size_t(100))
|
||||||
<< "%";
|
<< "%";
|
||||||
@@ -3762,7 +3762,7 @@ public:
|
|||||||
|
|
||||||
size_t current() {
|
size_t current() {
|
||||||
std::lock_guard<std::mutex> lock{mutex_};
|
std::lock_guard<std::mutex> lock{mutex_};
|
||||||
return std::min(static_cast<size_t>(progress_),
|
return (std::min)(static_cast<size_t>(progress_),
|
||||||
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
size_t(get_value<details::ProgressBarOption::max_progress>()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3819,7 +3819,7 @@ private:
|
|||||||
auto elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(now - start_time_point_);
|
auto elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(now - start_time_point_);
|
||||||
|
|
||||||
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
if (get_value<details::ProgressBarOption::show_percentage>()) {
|
||||||
os << " " << std::min(static_cast<size_t>(progress_ / max_progress * 100.0), size_t(100))
|
os << " " << (std::min)(static_cast<size_t>(progress_ / max_progress * 100.0), size_t(100))
|
||||||
<< "%";
|
<< "%";
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4544,7 +4544,7 @@ public:
|
|||||||
|
|
||||||
size_t current() {
|
size_t current() {
|
||||||
std::lock_guard<std::mutex> lock{mutex_};
|
std::lock_guard<std::mutex> lock{mutex_};
|
||||||
return std::min(progress_, size_t(get_value<details::ProgressBarOption::max_progress>()));
|
return (std::min)(progress_, size_t(get_value<details::ProgressBarOption::max_progress>()));
|
||||||
}
|
}
|
||||||
|
|
||||||
bool is_completed() const { return get_value<details::ProgressBarOption::completed>(); }
|
bool is_completed() const { return get_value<details::ProgressBarOption::completed>(); }
|
||||||
|
|||||||
Reference in New Issue
Block a user