From 542394c95add8bc99c697c8dc33887efe2b1ae20 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Sat, 23 Nov 2019 21:14:02 -0700 Subject: [PATCH 1/2] IPhreeqc: ifdef'd out references to std::cerr and std::cout --- Phreeqc.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Phreeqc.cpp b/Phreeqc.cpp index e300d820..08c747ce 100644 --- a/Phreeqc.cpp +++ b/Phreeqc.cpp @@ -2867,8 +2867,10 @@ Phreeqc &Phreeqc::operator=(const Phreeqc &rhs) // copy Phreeqc object to this //this->phrq_io = rhs.phrq_io; //this->phrq_io = new PHRQ_io; +#if !defined(R_SO) this->phrq_io->Set_output_ostream(&std::cout); this->phrq_io->Set_error_ostream(&std::cerr); +#endif this->init(); this->initialize(); this->InternalCopy(&rhs); From 6fe5c0e2cdb83a87e851503c64df6eb25a763495 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Sat, 23 Nov 2019 21:14:02 -0700 Subject: [PATCH 2/2] IPhreeqc: ifdef'd out references to std::cerr and std::cout --- phreeqcpp/Phreeqc.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/phreeqcpp/Phreeqc.cpp b/phreeqcpp/Phreeqc.cpp index e300d820..08c747ce 100644 --- a/phreeqcpp/Phreeqc.cpp +++ b/phreeqcpp/Phreeqc.cpp @@ -2867,8 +2867,10 @@ Phreeqc &Phreeqc::operator=(const Phreeqc &rhs) // copy Phreeqc object to this //this->phrq_io = rhs.phrq_io; //this->phrq_io = new PHRQ_io; +#if !defined(R_SO) this->phrq_io->Set_output_ostream(&std::cout); this->phrq_io->Set_error_ostream(&std::cerr); +#endif this->init(); this->initialize(); this->InternalCopy(&rhs);