diff options
| author | Aki <please@ignore.pl> | 2021-10-02 16:19:10 +0200 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2021-10-02 16:19:10 +0200 |
| commit | befb8be391543f4fadcc4f49aa48d219368e25a9 (patch) | |
| tree | 59b98e9738c2430ba9057dd0edf6d2cc14b3e2cd /Stars45/ComboList.cpp | |
| parent | 41b26fc450b60830ad3a9ed65941e51193d65e99 (diff) | |
| download | starshatter-befb8be391543f4fadcc4f49aa48d219368e25a9.zip starshatter-befb8be391543f4fadcc4f49aa48d219368e25a9.tar.gz starshatter-befb8be391543f4fadcc4f49aa48d219368e25a9.tar.bz2 | |
Replaced min max macros with std ones
Diffstat (limited to 'Stars45/ComboList.cpp')
| -rw-r--r-- | Stars45/ComboList.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Stars45/ComboList.cpp b/Stars45/ComboList.cpp index 4bf35cc..d070b9f 100644 --- a/Stars45/ComboList.cpp +++ b/Stars45/ComboList.cpp @@ -36,6 +36,10 @@ Drop-down list of Buttons class */ +#define NOMINMAX + +#include <algorithm> + #include "MemDebug.h" #include "ComboList.h" #include "ComboBox.h" @@ -168,7 +172,7 @@ ComboList::Draw() // opening: if (scrolling > 0) { - int limit = min(items.size(), max_entries); + int limit = std::min(items.size(), max_entries); if (scroll < limit) { if (limit > 6) |