From befb8be391543f4fadcc4f49aa48d219368e25a9 Mon Sep 17 00:00:00 2001 From: Aki Date: Sat, 2 Oct 2021 16:19:10 +0200 Subject: Replaced min max macros with std ones --- Stars45/ComboList.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'Stars45/ComboList.cpp') 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 + #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) -- cgit v1.1