OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4020 System : Define NOMINMAX before include of windows.h

Browse Source
This commit is contained in:
Magne Sjaastad 2019-01-31 20:31:14 +01:00
parent fc133c4475
commit 1a7de264ca
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Application/Tools/RiaLogging.cpp
View File

@ -23,6 +23,10 @@
#ifdef WIN32
#pragma warning (push)
#pragma warning (disable: 4668)
// Define this one to tell windows.h to not define min() and max() as macros
#if defined WIN32 && !defined NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#pragma warning (pop)
#else

4
Fwk/AppFwk/cafUserInterface/cafMemoryInspector.cpp
View File

@ -6,6 +6,10 @@
#include <QStringList>
#ifdef _WIN32
// Define this one to tell windows.h to not define min() and max() as macros
#if defined WIN32 && !defined NOMINMAX
#define NOMINMAX
#endif
#include "windows.h"
#include "psapi.h"
#elif defined (__linux__)

4
Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp
View File

@ -369,6 +369,10 @@ namespace caf {
#ifdef _MSC_VER
#pragma warning (push)
#pragma warning (disable: 4668)
// Define this one to tell windows.h to not define min() and max() as macros
#if defined WIN32 && !defined NOMINMAX
#define NOMINMAX
#endif
#include <windows.h>
#pragma warning (pop)
#endif