max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '488c119ac8fb2c9755ce3708519c79f4bd7d382c'

Browse Source
This commit is contained in:
Darth Vader 2023-11-18 03:54:34 +00:00
commit ba2ac19165
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phreeqcpp/Phreeqc.h
View File

@ -6,7 +6,6 @@
# define WINVER 0x0400
# endif
# include <afx.h>
// # define nullptr NULL
# endif
# include <windows.h>
# if defined(PHREEQCI_GUI)
@ -2096,7 +2095,7 @@ char* _string_duplicate(const char* token, const char* szFileName, int nLine);
// https://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010
#if defined(_MSC_VER) && (_MSC_VER < 1900)
#if (_MSC_VER == 1400) // VS2005
#if (_MSC_VER <= 1700) // VS2012
namespace std {
__inline bool isnan(double num) {
return _isnan(num) != 0;

3
phreeqcpp/global_structures.h
View File

@ -6,7 +6,8 @@
* #define DEFINITIONS
* ---------------------------------------------------------------------- */
#if !defined(NAN)
# if defined(_MSC_VER) && (_MSC_VER <= 1400) // VS2005
# if defined(_MSC_VER) && (_MSC_VER <= 1700) // VS2012
// https://learn.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=msvc-170
# include <limits>
# define NAN std::numeric_limits<double>::signaling_NaN()
# else