From 714859e57447f11cb05b37096dcd42269a22a5e9 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Thu, 15 Jul 2010 23:11:54 +0000
Subject: [PATCH] fixed hiding variables

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4641 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 IPhreeqc.vcproj    | 216 +++++++++++++++++++++++++++++++++++++++++++++
 include/IPhreeqc.h |   2 +-
 2 files changed, 217 insertions(+), 1 deletion(-)

diff --git a/IPhreeqc.vcproj b/IPhreeqc.vcproj
index 0c6aebcb..9b0d62ca 100644
--- a/IPhreeqc.vcproj
+++ b/IPhreeqc.vcproj
@@ -4683,18 +4683,78 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl;fi;fd"
 			>
+			<File
+				RelativePath=".\src\phreeqcpp\char_star.h"
+				>
+			</File>
 			<File
 				RelativePath="src\CVar.hxx"
 				>
 			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\cvdense.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\cvode.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\cxxKinetics.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\cxxMix.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\dense.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Dictionary.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\dumper.h"
+				>
+			</File>
 			<File
 				RelativePath="src\ErrorReporter.hxx"
 				>
 			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Exchange.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\ExchComp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\Form1.h"
+				>
+			</File>
 			<File
 				RelativePath=".\src\fwrap.h"
 				>
 			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\GasPhase.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\global.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\global_structures.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\input.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\IPhreeqc.f.inc"
 				>
@@ -4711,10 +4771,166 @@
 				RelativePath=".\include\IPhreeqc.hpp"
 				>
 			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\ISolution.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\ISolutionComp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\kinetics.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\KineticsComp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\NameDouble.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\NumKeyword.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\nvector.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\nvector_serial.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\output.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\p2c.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Parser.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\phqalloc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Phreeqc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Phreeqc_class.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\phrqtype.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\pitzer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\pitzer_structures.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\PPassemblage.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\PPassemblageComp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Reaction.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\runner.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SAXPhreeqc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SaxPhreeqcHandlers.h"
+				>
+			</File>
 			<File
 				RelativePath="src\SelectedOutput.hxx"
 				>
 			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\smalldense.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Solution.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SolutionIsotope.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SolutionIsotopeList.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SSassemblage.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SSassemblageSS.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\StorageBin.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\StorageBinList.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\sundialsmath.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\phreeqc\sundialstypes.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Surface.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SurfaceCharge.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\SurfaceComp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\System.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Temperature.h"
+				>
+			</File>
+			<File
+				RelativePath=".\src\phreeqcpp\Utils.h"
+				>
+			</File>
 			<File
 				RelativePath=".\include\Var.h"
 				>
diff --git a/include/IPhreeqc.h b/include/IPhreeqc.h
index fd459e54..bc26954a 100644
--- a/include/IPhreeqc.h
+++ b/include/IPhreeqc.h
@@ -15,7 +15,7 @@ typedef enum {
 	IPQ_INVALIDARG    = -3,  /*!< Failure, Invalid argument */
 	IPQ_INVALIDROW    = -4,  /*!< Failure, Invalid row */
 	IPQ_INVALIDCOL    = -5,  /*!< Failure, Invalid column */
-	IPQ_BADINSTANCE   = -6,  /*!< Failure, Invalid instance id */
+	IPQ_BADINSTANCE   = -6   /*!< Failure, Invalid instance id */
 } IPQ_RESULT;