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 no longer needed R_SO ifdefs

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@8702 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2014-05-02 03:41:04 +00:00
parent f92afa36fb
commit c343330920
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
class_main.cpp
View File

@ -310,9 +310,7 @@ process_file_names(int argc, char *argv[], std::istream **db_cookie,
try {
if (phrq_io == NULL)
{
#if !defined(R_SO)
std::cerr << "No PHRQ_io output handler defined in process_file_names" << "\n";
#endif
}
/*
* Prep for get_line
@ -509,9 +507,7 @@ process_file_names(int argc, char *argv[], std::istream **db_cookie,
try {
if (phrq_io == NULL)
{
#if !defined(R_SO)
std::cerr << "No PHRQ_io output handler defined in process_file_names" << "\n";
#endif
}
/*
* Prep for get_line
@ -706,12 +702,10 @@ open_input_stream(char *query, char *default_name, std::ios_base::openmode mode,
strcpy(name, default_name);
if (!batch )
{
#if !defined(R_SO)
#ifdef ERROR_OSTREAM
phrq_io->Set_error_ostream(&std::cerr);
#else
phrq_io->Set_error_file(stderr);
#endif
#endif
screen_msg(sformatf("%s\n", query));
if (default_name[0] != '\0')
@ -732,12 +726,10 @@ open_input_stream(char *query, char *default_name, std::ios_base::openmode mode,
new_stream = new std::ifstream(name, mode);
if (new_stream == NULL || !new_stream->is_open())
{
#if !defined(R_SO)
#ifdef ERROR_OSTREAM
phrq_io->Set_error_ostream(&std::cerr);
#else
phrq_io->Set_error_file(stderr);
#endif
#endif
error_string = sformatf( "\nERROR: Cannot open file, %s.\n", name);
screen_msg(error_string);
@ -785,12 +777,10 @@ open_output_stream(char *query, char *default_name, std::ios_base::openmode mode
strcpy(name, default_name);
if (!batch )
{
#if !defined(R_SO)
#ifdef ERROR_OSTREAM
phrq_io->Set_error_ostream(&std::cerr);
#else
phrq_io->Set_error_file(stderr);
#endif
#endif
screen_msg(sformatf("%s\n", query));
@ -812,12 +802,10 @@ open_output_stream(char *query, char *default_name, std::ios_base::openmode mode
new_stream = new std::ofstream(name, mode);
if (new_stream == NULL || !new_stream->is_open())
{
#if !defined(R_SO)
#ifdef ERROR_OSTREAM
phrq_io->Set_error_ostream(&std::cerr);
#else
phrq_io->Set_error_file(stderr);
#endif
#endif
error_string = sformatf( "\nERROR: Cannot open file, %s.\n", name);
screen_msg(error_string);
@ -862,12 +850,10 @@ open_output_file(char *query, char *default_name, std::ios_base::openmode mode,
strcpy(name, default_name);
if (!batch )
{
#if !defined(R_SO)
#ifdef ERROR_OSTREAM
phrq_io->Set_error_ostream(&std::cerr);
#else
phrq_io->Set_error_file(stderr);
#endif
#endif
screen_msg(sformatf("%s\n", query));
if (default_name[0] != '\0')
@ -888,12 +874,10 @@ open_output_file(char *query, char *default_name, std::ios_base::openmode mode,
new_stream = new std::ofstream(name, mode);
if (new_stream == NULL || !new_stream->is_open())
{
#if !defined(R_SO)
#ifdef ERROR_OSTREAM
phrq_io->Set_error_ostream(&std::cerr);
#else
phrq_io->Set_error_file(stderr);
#endif
#endif
error_string = sformatf( "\nERROR: Cannot open file, %s.\n", name);
screen_msg(error_string);