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

removed dependency on phrqtype.h by using a template for addPair

Browse Source 
removed unnecessary Phreeqc.h

git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@6512 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-04-19 22:19:46 +00:00
parent 3d2e4ae4be
commit 3eb956bdf0
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Parser.cxx
View File

@ -13,7 +13,6 @@
#include "Utils.h"
#include <stdio.h>
#include "Parser.h"
#include "Phreeqc.h"
#include "PHRQ_io.h"
//////////////////////////////////////////////////////////////////////
@ -989,12 +988,12 @@ CParser::STATUS_TYPE CParser::parse_couple(std::string & token)
return PARSER_OK;
}
CParser::STATUS_TYPE CParser::addPair(std::map < std::string, LDBLE >&totals,
template <class T>
CParser::STATUS_TYPE CParser::addPair(std::map < std::string, T >&totals,
std::istream::pos_type & pos)
{
std::string token;
LDBLE
d;
T d;
CParser::TOKEN_TYPE j;
m_line_iss.seekg(pos);

4
Parser.h
View File

@ -3,7 +3,6 @@
#if defined(WIN32)
#include <windows.h>
#endif
#include "phrqtype.h"
#include <string> // std::string
#include <map> // std::map
#include <vector> // std::vector
@ -247,7 +246,8 @@ class CParser: public PHRQ_base
STATUS_TYPE parse_couple(std::string & token);
STATUS_TYPE addPair(std::map < std::string, LDBLE >&totals,
template <class T>
STATUS_TYPE addPair(std::map < std::string, T >&totals,
std::istream::pos_type & pos);
protected: