From 38cce32bac4428d841cac94fdd1e663ccc2b01b3 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Wed, 19 Jun 2019 11:21:21 +0200
Subject: [PATCH] [CL] Phreeqc; Move global variable into class.
The instance_id is used exclusively in the PhreeqcIO class.
---
ChemistryLib/PhreeqcIO.cpp | 2 --
ChemistryLib/PhreeqcIO.h | 1 +
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ChemistryLib/PhreeqcIO.cpp b/ChemistryLib/PhreeqcIO.cpp
index c81d722f235..430fda2dc85 100644
--- a/ChemistryLib/PhreeqcIO.cpp
+++ b/ChemistryLib/PhreeqcIO.cpp
@@ -29,8 +29,6 @@ std::ostream& operator<<(std::ostream& os,
std::ostream_iterator<DataBlock>(os));
return os;
}
-
-static const int phreeqc_instance_id = 0;
} // namespace
PhreeqcIO::PhreeqcIO(
diff --git a/ChemistryLib/PhreeqcIO.h b/ChemistryLib/PhreeqcIO.h
index a6f6b5182c0..5ec9dbb5598 100644
--- a/ChemistryLib/PhreeqcIO.h
+++ b/ChemistryLib/PhreeqcIO.h
@@ -71,5 +71,6 @@ private:
std::vector<std::pair<int, std::string>> const&
_process_id_to_component_name_map;
double _dt = std::numeric_limits<double>::quiet_NaN();
+ const int phreeqc_instance_id = 0;
};
} // namespace ChemistryLib
--
GitLab