fixed hiding variables

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@4640 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-07-15 21:53:09 +00:00
parent 1e9f6e5760
commit bf1e9bfff6
2 changed files with 20 additions and 20 deletions

View File

@ -29,9 +29,9 @@ class cxxSolution:public cxxNumKeyword
{
return this->tc;
}
void set_tc(double tc)
void set_tc(double tc1)
{
this->tc = tc;
this->tc = tc1;
}
double get_ph() const
@ -47,72 +47,72 @@ class cxxSolution:public cxxNumKeyword
{
return this->pe;
}
void set_pe(double pe)
void set_pe(double pe1)
{
this->pe = pe;
this->pe = pe1;
}
double get_mu() const
{
return this->mu;
}
void set_mu(double mu)
void set_mu(double mu1)
{
this->mu = mu;
this->mu = mu1;
}
double get_ah2o() const
{
return this->ah2o;
}
void set_ah2o(double ah2o)
void set_ah2o(double ah2o1)
{
this->ah2o = ah2o;
this->ah2o = ah2o1;
}
double get_total_h() const
{
return this->total_h;
}
void set_total_h(double total_h)
void set_total_h(double total_h1)
{
this->total_h = total_h;
this->total_h = total_h1;
}
double get_total_o() const
{
return this->total_o;
}
void set_total_o(double total_o)
void set_total_o(double total_o1)
{
this->total_o = total_o;
this->total_o = total_o1;
}
double get_cb() const
{
return this->cb;
}
void set_cb(double cb)
void set_cb(double cb1)
{
this->cb = cb;
this->cb = cb1;
}
double get_mass_water() const
{
return this->mass_water;
}
void set_mass_water(long double mass_water)
void set_mass_water(long double mass_water1)
{
this->mass_water = mass_water;
this->mass_water = mass_water1;
}
double get_total_alkalinity() const
{
return this->total_alkalinity;
}
void set_total_alkalinity(double total_alkalinity)
void set_total_alkalinity(double total_alkalinity1)
{
this->total_alkalinity = total_alkalinity;
this->total_alkalinity = total_alkalinity1;
}
double get_total(char *string) const;

View File

@ -83,10 +83,10 @@ cxxNumKeyword()
}
}
cxxSurface::cxxSurface(PHREEQC_PTR_ARG_COMMA const std::map < int, cxxSurface > &entities,
cxxMix & mix, int n_user):
cxxMix & mix, int n_user1):
cxxNumKeyword()
{
this->n_user = this->n_user_end = n_user;
this->n_user = this->n_user_end = n_user1;
type = DDL;
dl_type = NO_DL;
sites_units = SITES_ABSOLUTE;