From eb7fd1d524051e95a5b42a2f85b9d65ccebacd11 Mon Sep 17 00:00:00 2001
From: jkriege2 <jan@jkrieger.de>
Date: Mon, 29 Jun 2020 07:59:11 +0200
Subject: [PATCH] some bugfixes for VStudio NOMINMAX-problem ...

---
 lib/jkqtcommon/CMakeLists.txt      | 4 ++--
 lib/jkqtfastplotter/CMakeLists.txt | 4 ++--
 lib/jkqtmathtext/CMakeLists.txt    | 4 ++--
 lib/jkqtplotter/CMakeLists.txt     | 4 ++--
 lib/jkqtplotter/jkqtpdatastorage.h | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/jkqtcommon/CMakeLists.txt b/lib/jkqtcommon/CMakeLists.txt
index 32a4b7e732..018fb35629 100644
--- a/lib/jkqtcommon/CMakeLists.txt
+++ b/lib/jkqtcommon/CMakeLists.txt
@@ -85,7 +85,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${libsh_name} PUBLIC /EHsc)
-      target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${libsh_name} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
@@ -110,7 +110,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${lib_name} PUBLIC /EHsc)
-      target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${lib_name} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
diff --git a/lib/jkqtfastplotter/CMakeLists.txt b/lib/jkqtfastplotter/CMakeLists.txt
index 71e8574cad..5679fd6323 100644
--- a/lib/jkqtfastplotter/CMakeLists.txt
+++ b/lib/jkqtfastplotter/CMakeLists.txt
@@ -48,7 +48,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${libsh_name} PUBLIC /EHsc)
-      target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_compile_definitions(${libsh_name} PRIVATE JKQTFASTPLOTTER_LIB_EXPORT_LIBRARY)
 	target_include_directories(${libsh_name} PUBLIC
@@ -73,7 +73,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${lib_name} PUBLIC /EHsc)
-      target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
     endif()
     target_compile_features(${lib_name} PUBLIC cxx_std_11)
     target_link_libraries(${lib_name} PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets Qt5::PrintSupport Qt5::OpenGL JKQTCommonLib)
diff --git a/lib/jkqtmathtext/CMakeLists.txt b/lib/jkqtmathtext/CMakeLists.txt
index 775298abbb..c22565ab68 100644
--- a/lib/jkqtmathtext/CMakeLists.txt
+++ b/lib/jkqtmathtext/CMakeLists.txt
@@ -54,7 +54,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${libsh_name} PUBLIC /EHsc)
-      target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${libsh_name} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
@@ -82,7 +82,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${lib_name} PUBLIC /EHsc)
-      target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
     endif()
     if(JKQtPlotter_BUILD_INCLUDE_XITS_FONTS)
         target_compile_definitions(${lib_name} PRIVATE JKQTMATHTEXT_COMPILED_WITH_XITS)
diff --git a/lib/jkqtplotter/CMakeLists.txt b/lib/jkqtplotter/CMakeLists.txt
index 809771d1b3..f346e6826b 100644
--- a/lib/jkqtplotter/CMakeLists.txt
+++ b/lib/jkqtplotter/CMakeLists.txt
@@ -146,7 +146,7 @@ if(JKQtPlotter_BUILD_SHARED_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${libsh_name} PUBLIC /EHsc)
-      target_compile_definitions(${libsh_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${libsh_name} PUBLIC NOMINMAX)
     endif()
     target_include_directories(${libsh_name} PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../>
@@ -170,7 +170,7 @@ if(JKQtPlotter_BUILD_STATIC_LIBS)
     elseif(MSVC)
       # COMPILER-SETTINGS FOR MS VISUAL C++
       target_compile_options(${lib_name} PUBLIC /EHsc)
-      target_compile_definitions(${lib_name} PUBLIC /DNOMINMAX)
+      target_compile_definitions(${lib_name} PUBLIC NOMINMAX)
     endif()
     target_compile_features(${lib_name} PUBLIC cxx_std_11)
     target_include_directories(${lib_name} PUBLIC
diff --git a/lib/jkqtplotter/jkqtpdatastorage.h b/lib/jkqtplotter/jkqtpdatastorage.h
index 0f989fa5c6..2d88aa8527 100644
--- a/lib/jkqtplotter/jkqtpdatastorage.h
+++ b/lib/jkqtplotter/jkqtpdatastorage.h
@@ -1261,7 +1261,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPDatastore{
          *
          * Pseudocode:
          * \code
-         *   for (i=0; i<min(rows(otherColumnX), rows(otherColumnY)); i++) {
+         *   for (i=0; i<std::min(rows(otherColumnX), rows(otherColumnY)); i++) {
          *     newColumn.push_back(f(getValue(otherColumnX, i), getValue(otherColumnY, i));
          *   }
          *   return newColumn;