From b96cfe81141ed6734872794468ac9bb321ba9d8b Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Tue, 5 Mar 2024 15:41:19 +0000 Subject: [PATCH] Squashed 'src/' changes from ba2ac191..64e51c1d MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- phreeqcpp/common/Utils.cxx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/phreeqcpp/common/Utils.cxx b/phreeqcpp/common/Utils.cxx index 0e8d461a..6738fa9d 100644 --- a/phreeqcpp/common/Utils.cxx +++ b/phreeqcpp/common/Utils.cxx @@ -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