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

fixed for latest phreeqc3 (only TestIPhreeqcLib)

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@6778 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2012-07-13 00:32:01 +00:00
parent 2e463d6f79
commit d91607335b
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
IPhreeqc.cpp
View File

@ -1252,7 +1252,15 @@ void IPhreeqc::log_msg(const char * str)
void IPhreeqc::error_msg(const char *str, bool stop) void IPhreeqc::error_msg(const char *str, bool stop)
{ {
ASSERT(!(this->ErrorFileOn ^ (this->error_ostream != 0))); ASSERT(!(this->ErrorFileOn ^ (this->error_ostream != 0)));
if (this->error_ostream != NULL && this->error_on)
{
(*this->error_ostream) << str;
}
bool save_error_on = this->error_on;
this->error_on = false;
this->PHRQ_io::error_msg(str); this->PHRQ_io::error_msg(str);
this->error_on = save_error_on;
if (this->ErrorStringOn && this->error_on) if (this->ErrorStringOn && this->error_on)
{ {
@ -1272,7 +1280,15 @@ void IPhreeqc::error_msg(const char *str, bool stop)
void IPhreeqc::warning_msg(const char *str) void IPhreeqc::warning_msg(const char *str)
{ {
ASSERT(!(this->ErrorFileOn ^ (this->error_ostream != 0))); ASSERT(!(this->ErrorFileOn ^ (this->error_ostream != 0)));
if (this->error_ostream != NULL && this->error_on)
{
(*this->error_ostream) << str << "\n";
}
bool save_error_on = this->error_on;
this->error_on = false;
this->PHRQ_io::warning_msg(str); this->PHRQ_io::warning_msg(str);
this->error_on = save_error_on;
std::ostringstream oss; std::ostringstream oss;
oss << str << std::endl; oss << str << std::endl;