Skip to content

Commit

Permalink
Squashed 'src/' changes from 9925ceb3..87919a00
Browse files Browse the repository at this point in the history
87919a00 Merge commit 'b397d9d56c7985fddac5b7dbe8cd3c63152bf033'
b397d9d5 Squashed 'common/' changes from 11183a1..6abe004
a25b00d3 Try this to fix warning on Darwin
a2f6386d fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04

git-subtree-dir: src
git-subtree-split: 87919a001bdcde90d6559f597b06586d0d5015fd
  • Loading branch information
Darth Vader committed Mar 5, 2024
1 parent bd4105b commit a48f347
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions common/Utils.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a48f347

Please # to comment.