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

Cleaned up kinetics.cpp.

Browse Source 
Changed io in Parser.cxx a little.

git-svn-id: svn://136.177.114.72/svn_GW/phreeqcpp/branches/ErrorHandling@5696 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2011-10-18 19:27:52 +00:00
parent 1fb2150c82
commit 534005377e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PHRQ_io.h
View File

@ -43,12 +43,12 @@ typedef enum
int close_input_files(void);
int close_output_files(void);
static int istream_getc(void *cookie);
void output_string(const int type, std::string str);
int output_open(int type, const char *file_name);
void error_msg(const char *err_str, bool stop);
void warning_msg(const char *err_str);
void output_msg(int type, const char *format, va_list args);
void output_string(const int type, std::string str);
void output_fflush(int type);
void output_rewind(int type);
void output_close(int type);

6
Parser.cxx
View File

@ -130,7 +130,7 @@ CParser::LINE_TYPE CParser::check_line(const std::string & str,
{
std::ostringstream msg;
msg << "\t" << m_line_save << "\n";
this->Get_io()->output_string(PHRQ_io::OUTPUT_MESSAGE, msg.str());
this->output_msg(msg.str());
}
break;
case EO_KEYWORDS:
@ -138,7 +138,7 @@ CParser::LINE_TYPE CParser::check_line(const std::string & str,
{
std::ostringstream msg;
msg << "\t" << m_line_save << "\n";
this->Get_io()->output_string(PHRQ_io::OUTPUT_MESSAGE, msg.str());
this->output_msg(msg.str());
}
break;
@ -147,7 +147,7 @@ CParser::LINE_TYPE CParser::check_line(const std::string & str,
{
std::ostringstream msg;
msg << "\t" << m_line_save << "\n";
this->Get_io()->output_string(PHRQ_io::OUTPUT_MESSAGE, msg.str());
this->output_msg(msg.str().c_str());
}
break;
}