mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
Squashed 'phreeqcpp/' changes from 9925ceb..87919a0
87919a0 Merge commit 'b397d9d56c7985fddac5b7dbe8cd3c63152bf033' b397d9d Squashed 'common/' changes from 11183a1..6abe004 a25b00d Try this to fix warning on Darwin a2f6386 fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04 git-subtree-dir: phreeqcpp git-subtree-split: 87919a001bdcde90d6559f597b06586d0d5015fd
This commit is contained in:
parent
488c119ac8
commit
0ebad0eedc
@ -16,6 +16,12 @@
|
||||
# define nullptr NULL
|
||||
#endif
|
||||
|
||||
#if __cplusplus < 201103L // Check if C++ standard is pre-C++11
|
||||
# ifndef nullptr
|
||||
# define nullptr NULL
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#if defined(PHREEQCI_GUI)
|
||||
#ifdef _DEBUG
|
||||
#define new DEBUG_NEW
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user