Reversed logic to NO_STATIC_VOPTS, default is now static vopts. No changes to Makefile or project needed now.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6771 1feff8c3-07ed-0310-ac33-dd36852eb9cd
2025-12-16 16:44:49 +01:00 · 2012-07-11 16:39:13 +00:00 · 2012-07-11 16:39:13 +00:00 · 0ca9654356
commit 0ca9654356
parent 8823f0ff2f
24 changed files with 72 additions and 72 deletions
--- a/ChartObject.cpp
+++ b/ChartObject.cpp
@ -243,10 +243,10 @@ ChartObject::Set_axis_scale(CParser & parser)
 bool
 ChartObject::Read(CParser & parser)
 {
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/ExchComp.cxx
+++ b/ExchComp.cxx
@ -179,10 +179,10 @@ cxxExchComp::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/Exchange.cxx
+++ b/Exchange.cxx
@ -196,10 +196,10 @@ cxxExchange::dump_raw(std::ostream & s_oss, unsigned int indent, int *n_out) con
 void
 cxxExchange::read_raw(CParser & parser, bool check)
 {
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/GasComp.cxx
+++ b/GasComp.cxx
@ -62,10 +62,10 @@ cxxGasComp::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/GasPhase.cxx
+++ b/GasPhase.cxx
@ -273,10 +273,10 @@ cxxGasPhase::read_raw(CParser & parser, bool check)
 {

 	int i;
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/KineticsComp.cxx
+++ b/KineticsComp.cxx
@ -134,10 +134,10 @@ cxxKineticsComp::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/PPassemblage.cxx
+++ b/PPassemblage.cxx
@ -125,10 +125,10 @@ cxxPPassemblage::dump_raw(std::ostream & s_oss, unsigned int indent, int *n_out)
 void
 cxxPPassemblage::read_raw(CParser & parser, bool check)
 {
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/PPassemblageComp.cxx
+++ b/PPassemblageComp.cxx
@ -106,10 +106,10 @@ cxxPPassemblageComp::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/Pressure.cxx
+++ b/Pressure.cxx
@ -198,10 +198,10 @@ cxxPressure::read_raw(CParser & parser)
 	bool cleared_once = false;
 	LDBLE d;
 	CParser::TOKEN_TYPE k;
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/Reaction.cxx
+++ b/Reaction.cxx
@ -131,10 +131,10 @@ cxxReaction::read_raw(CParser & parser, const bool check)
 	int j;
 	LDBLE d;
 	CParser::TOKEN_TYPE k;
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/SS.cxx
+++ b/SS.cxx
@ -126,10 +126,10 @@ cxxSS::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/SSassemblage.cxx
+++ b/SSassemblage.cxx
@ -126,10 +126,10 @@ cxxSSassemblage::dump_raw(std::ostream & s_oss, unsigned int indent, int *n_out)
 void
 cxxSSassemblage::read_raw(CParser & parser, bool check)
 {
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/SScomp.cxx
+++ b/SScomp.cxx
@ -92,10 +92,10 @@ cxxSScomp::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/Solution.cxx
+++ b/Solution.cxx
@ -292,10 +292,10 @@ cxxSolution::dump_raw(std::ostream & s_oss, unsigned int indent, int *n_out) con
 void
 cxxSolution::read_raw(CParser & parser, bool check)
 {
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/SolutionIsotope.cxx
+++ b/SolutionIsotope.cxx
@ -95,10 +95,10 @@ cxxSolutionIsotope::dump_raw(std::ostream & s_oss, unsigned int indent) const
 }
 void cxxSolutionIsotope::read_raw(CParser & parser, bool check )
 {
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/StorageBinList.cpp
+++ b/StorageBinList.cpp
@ -138,10 +138,10 @@ void StorageBinList::SetAll(bool tf)
 bool StorageBinList::Read(CParser & parser)
 {
 	bool return_value(true);
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/Surface.cxx
+++ b/Surface.cxx
@ -234,10 +234,10 @@ cxxSurface::dump_raw(std::ostream & s_oss, unsigned int indent, int *n_out) cons
 void
 cxxSurface::read_raw(CParser & parser, bool check)
 {
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	int i = 0;
 	if (vopts.empty())
--- a/SurfaceCharge.cxx
+++ b/SurfaceCharge.cxx
@ -118,10 +118,10 @@ cxxSurfaceCharge::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/SurfaceComp.cxx
+++ b/SurfaceComp.cxx
@ -114,10 +114,10 @@ cxxSurfaceComp::read_raw(CParser & parser, bool check)
 {
 	std::string str;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/Temperature.cxx
+++ b/Temperature.cxx
@ -236,10 +236,10 @@ cxxTemperature::read_raw(CParser & parser)
 	// clear steps for modify operation, if pressures are read
 	bool cleared_once = false;

-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/cxxKinetics.cxx
+++ b/cxxKinetics.cxx
@ -187,10 +187,10 @@ cxxKinetics::read_raw(CParser & parser, bool check)
 {

 	LDBLE d;
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/cxxMix.cxx
+++ b/cxxMix.cxx
@ -95,10 +95,10 @@ cxxMix::read_raw(CParser & parser)

 	int i;
 	LDBLE d;
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/dumper.cpp
+++ b/dumper.cpp
@ -33,10 +33,10 @@ void dumper::SetAll(bool tf)
 bool dumper::Read(CParser & parser)
 {
 	bool return_value(true);
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{
--- a/runner.cpp
+++ b/runner.cpp
@ -28,10 +28,10 @@ bool runner::Read(CParser & parser)
 {

 	bool return_value(true);
-#if defined(STATIC_VOPTS)
-	static std::vector < std::string > vopts;
-#else
+#if defined(NO_STATIC_VOPTS)
 	std::vector < std::string > vopts;
+#else
+	static std::vector < std::string > vopts;
 #endif
 	if (vopts.empty())
 	{