mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 16:44:49 +01:00
Squashed 'src/' changes from ba2ac191..64e51c1d
64e51c1d Try this to fix warning on Darwin 79518dee fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04 git-subtree-dir: src git-subtree-split: 64e51c1d13711fd636fc9df7532d21d3584b52aa
This commit is contained in:
parent
7f291d1c56
commit
b96cfe8114
@ -16,6 +16,12 @@
|
|||||||
# define nullptr NULL
|
# define nullptr NULL
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if __cplusplus < 201103L // Check if C++ standard is pre-C++11
|
||||||
|
# ifndef nullptr
|
||||||
|
# define nullptr NULL
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(PHREEQCI_GUI)
|
#if defined(PHREEQCI_GUI)
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
#define new DEBUG_NEW
|
#define new DEBUG_NEW
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user