From a48f347f9b8f57b3393f92700661a1e541126d2b Mon Sep 17 00:00:00 2001
From: Darth Vader <darth@empire.com>
Date: Tue, 5 Mar 2024 15:45:33 +0000
Subject: [PATCH] Squashed 'src/' changes from 9925ceb3..87919a00
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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
---
 common/Utils.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/common/Utils.cxx b/common/Utils.cxx
index 0e8d461ae..6738fa9d4 100644
--- a/common/Utils.cxx
+++ b/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