max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed warning messages from compiler

Browse Source 
casts, bool conversion, others

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/trunk@1009 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2006-07-07 22:13:43 +00:00
parent 309d3d7bee
commit cb46a1debf
7 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NameDouble.h
View File

@ -1,14 +1,14 @@
#if !defined(NAMEDOUBLE_H_INCLUDED) #if !defined(NAMEDOUBLE_H_INCLUDED)
#define NAMEDOUBLE_H_INCLUDED #define NAMEDOUBLE_H_INCLUDED
#define EXTERNAL extern //#define EXTERNAL extern
#include <cassert> // assert #include <cassert> // assert
#include <map> // std::map #include <map> // std::map
#include <string> // std::string #include <string> // std::string
#include <list> // std::list #include <list> // std::list
#include <vector> // std::vector #include <vector> // std::vector
#include "global.h" //#include "global.h"
#include "char_star.h" #include "char_star.h"
#include "Parser.h" #include "Parser.h"
class cxxNameDouble : public std::map <char *, double, CHARSTAR_LESS> class cxxNameDouble : public std::map <char *, double, CHARSTAR_LESS>

2
PPassemblageComp.cxx
View File

@ -301,7 +301,7 @@ void cxxPPassemblageComp::mpi_unpack(int *ints, int *ii, double *doubles, int *d
this->moles = doubles[d++]; this->moles = doubles[d++];
this->delta = doubles[d++]; this->delta = doubles[d++];
this->initial_moles = doubles[d++]; this->initial_moles = doubles[d++];
this->dissolve_only = (bool) ints[i++]; this->dissolve_only = (ints[i++] != 0);
*ii = i; *ii = i;
*dd = d; *dd = d;
} }

2
SSassemblageSS.cxx
View File

@ -467,7 +467,7 @@ void cxxSSassemblageSS::mpi_unpack(int *ints, int *ii, double *doubles, int *dd)
this->a1 = doubles[d++]; this->a1 = doubles[d++];
this->ag0 = doubles[d++]; this->ag0 = doubles[d++];
this->ag1 = doubles[d++]; this->ag1 = doubles[d++];
this->miscibility = (bool) ints[i++]; this->miscibility = (ints[i++] != 0);
this->xb1 = doubles[d++]; this->xb1 = doubles[d++];
this->xb2 = doubles[d++]; this->xb2 = doubles[d++];
*ii = i; *ii = i;

4
Solution.h
View File

@ -6,8 +6,8 @@
#include "NameDouble.h" #include "NameDouble.h"
#include "cxxMix.h" #include "cxxMix.h"
#define EXTERNAL extern //#define EXTERNAL extern
#include "global.h" //#include "global.h"
#include <cassert> // assert #include <cassert> // assert
#include <map> // std::map #include <map> // std::map
#include <string> // std::string #include <string> // std::string

5
SolutionIsotopeList.h
View File

@ -1,15 +1,16 @@
#if !defined(SOLUTIONISOTOPELIST_H_INCLUDED) #if !defined(SOLUTIONISOTOPELIST_H_INCLUDED)
#define SOLUTIONISOTOPELIST_H_INCLUDED #define SOLUTIONISOTOPELIST_H_INCLUDED
#define EXTERNAL extern //#define EXTERNAL extern
#include "SolutionIsotope.h" #include "SolutionIsotope.h"
#include "global.h" //#include "global.h"
#include <cassert> // assert #include <cassert> // assert
#include <string> // std::string #include <string> // std::string
#include <list> // std::list #include <list> // std::list
#include "char_star.h" #include "char_star.h"
#include "Parser.h" #include "Parser.h"
class cxxSolutionIsotopeList : public std::list <cxxSolutionIsotope> class cxxSolutionIsotopeList : public std::list <cxxSolutionIsotope>
{ {

8
Surface.cxx
View File

@ -414,10 +414,10 @@ void cxxSurface::mpi_unpack(int *ints, int *ii, double *doubles, int *dd)
sc.mpi_unpack(ints, &i, doubles, &d); sc.mpi_unpack(ints, &i, doubles, &d);
this->surfaceCharges.push_back(sc); this->surfaceCharges.push_back(sc);
} }
this->diffuse_layer = (bool) ints[i++]; this->diffuse_layer = (ints[i++] != 0);
this->edl = (bool) ints[i++]; this->edl = (ints[i++] != 0);
this->only_counter_ions = (bool) ints[i++]; this->only_counter_ions = (ints[i++] != 0);
this->donnan = (bool) ints[i++]; this->donnan = (ints[i++] != 0);
this->thickness = doubles[d++]; this->thickness = doubles[d++];
*ii = i; *ii = i;
*dd = d; *dd = d;

4
cxxMix.h
View File

@ -2,8 +2,8 @@
#define CXXMIX_H_INCLUDED #define CXXMIX_H_INCLUDED
#include "NumKeyword.h" #include "NumKeyword.h"
#define EXTERNAL extern //#define EXTERNAL extern
#include "global.h" //#include "global.h"
#include <cassert> // assert #include <cassert> // assert
#include <map> // std::map #include <map> // std::map
#include <string> // std::string #include <string> // std::string