From aa17ca7e483eaaec0b2c191e20a404adeed7a178 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Thu, 15 Aug 2024 17:16:41 +0000 Subject: [PATCH] Squashed 'src/phast/PhreeqcRM/' changes from 0b094796..bfe6cff1 bfe6cff1 Merge commit '3aa145af1b351881075d58dc46edbd5961209499' 3aa145af Squashed 'src/' changes from 1336703a..ce8a68fa git-subtree-dir: src/phast/PhreeqcRM git-subtree-split: bfe6cff149dfc6f4f6cb5ac56e5ce83550bc7211 --- src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp | 2 +- src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h | 2 +- src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp | 2 +- src/IPhreeqcPhast/IPhreeqc/IPhreeqcLib.cpp | 2 +- src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.cpp | 2 +- src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.h | 2 +- src/IPhreeqcPhast/IPhreeqc/fimpl.h | 2 +- src/IPhreeqcPhast/IPhreeqc/fwrap.cpp | 2 +- src/IPhreeqcPhast/IPhreeqc/fwrap.h | 2 +- src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Phreeqc.h | 6 +++--- src/IPhreeqcPhast/IPhreeqc/phreeqcpp/basicsubs.cpp | 6 +++--- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp index c71c42ac4..20b967b43 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.cpp @@ -931,7 +931,7 @@ void IPhreeqc::SetBasicCallback(double (*fcn)(double x1, double x2, const char * this->PhreeqcPtr->register_basic_callback(fcn, cookie1); } #ifdef IPHREEQC_NO_FORTRAN_MODULE -void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, size_t l)) +void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, const char *str, size_t l)) { this->PhreeqcPtr->register_fortran_basic_callback(fcn); } diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h index 62d990296..6be24c247 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.h @@ -1711,7 +1711,7 @@ Headings * @include ic */ #ifdef IPHREEQC_NO_FORTRAN_MODULE - IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l)); + IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, const char *str, size_t l)); #else IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, const char *str, int l)); #endif diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp index c79957b5f..036b14caa 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc.hpp @@ -718,7 +718,7 @@ class IPQ_DLL_EXPORT IPhreeqc : public PHRQ_io * @see SetBasicCallback */ #ifdef IPHREEQC_NO_FORTRAN_MODULE - void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, size_t l)); + void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, const char *str, size_t l)); #else void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, const char *str, int l)); #endif diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqcLib.cpp b/src/IPhreeqcPhast/IPhreeqc/IPhreeqcLib.cpp index b57755ab1..d0a3f0ba4 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqcLib.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqcLib.cpp @@ -802,7 +802,7 @@ SetBasicCallback(int id, double (*fcn)(double x1, double x2, const char *str, vo #if !defined(R_SO) #ifdef IPHREEQC_NO_FORTRAN_MODULE IPQ_RESULT -SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, size_t l)) +SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, const char *str, size_t l)) { IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); if (IPhreeqcPtr) diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.cpp b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.cpp index e25590fb8..4063d748a 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.cpp @@ -414,7 +414,7 @@ RunStringF(int *id, char* input) } #ifdef IPHREEQC_NO_FORTRAN_MODULE IPQ_RESULT -SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l)) +SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, const char *str, size_t l)) { return ::SetBasicFortranCallback(*id, fcn); } diff --git a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.h b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.h index d3fe29eca..3e77604f4 100644 --- a/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.h +++ b/src/IPhreeqcPhast/IPhreeqc/IPhreeqc_interface_F.h @@ -133,7 +133,7 @@ extern "C" { IPQ_DLL_EXPORT int RunFileF(int *id, char* filename); IPQ_DLL_EXPORT int RunStringF(int *id, char* input); #ifdef IPHREEQC_NO_FORTRAN_MODULE - IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l)); + IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, const char *str, size_t l)); #else IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, const char *str, int l)); #endif diff --git a/src/IPhreeqcPhast/IPhreeqc/fimpl.h b/src/IPhreeqcPhast/IPhreeqc/fimpl.h index de9eb2141..eddf5a45f 100644 --- a/src/IPhreeqcPhast/IPhreeqc/fimpl.h +++ b/src/IPhreeqcPhast/IPhreeqc/fimpl.h @@ -208,7 +208,7 @@ IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(runstring, RUNSTRING, runstring_, RUNS { return RunStringF(id, input, len); } -IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setbasicfortrancallback, SETBASICFORTRANCALLBACK, setbasicfortrancallback_, SETBASICFORTRANCALLBACK_)(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l)) +IPQ_DLL_EXPORT int IPQ_DECL IPQ_CASE_UND(setbasicfortrancallback, SETBASICFORTRANCALLBACK, setbasicfortrancallback_, SETBASICFORTRANCALLBACK_)(int *id, double (*fcn)(double *x1, double *x2, const char *str, size_t l)) { return SetBasicFortranCallbackF(id, fcn); } diff --git a/src/IPhreeqcPhast/IPhreeqc/fwrap.cpp b/src/IPhreeqcPhast/IPhreeqc/fwrap.cpp index bdec8e5a1..6903c4f81 100644 --- a/src/IPhreeqcPhast/IPhreeqc/fwrap.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/fwrap.cpp @@ -482,7 +482,7 @@ RunStringF(int *id, char* input, size_t input_length) } IPQ_RESULT -SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l)) +SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, const char *str, size_t l)) { return ::SetBasicFortranCallback(*id, fcn); } diff --git a/src/IPhreeqcPhast/IPhreeqc/fwrap.h b/src/IPhreeqcPhast/IPhreeqc/fwrap.h index c95758d0d..b4449f305 100644 --- a/src/IPhreeqcPhast/IPhreeqc/fwrap.h +++ b/src/IPhreeqcPhast/IPhreeqc/fwrap.h @@ -135,7 +135,7 @@ extern "C" { int RunAccumulatedF(int *id); int RunFileF(int *id, char* filename, size_t filename_length); int RunStringF(int *id, char* input, size_t input_length); - IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, size_t l)); + IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, const char *str, size_t l)); IPQ_RESULT SetCurrentSelectedOutputUserNumberF(int *id, int *n); IPQ_RESULT SetDumpFileNameF(int *id, char* fname, size_t fname_length); IPQ_RESULT SetDumpFileOnF(int *id, int* dump_on); diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Phreeqc.h b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Phreeqc.h index 5607f2bca..ddff8262b 100644 --- a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Phreeqc.h +++ b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/Phreeqc.h @@ -93,13 +93,13 @@ class Phreeqc int basic_run(char* commands, void* lnbase, void* vbase, void* lpbase); void basic_free(void); #ifdef IPHREEQC_NO_FORTRAN_MODULE - double basic_callback(double x1, double x2, char* str); + double basic_callback(double x1, double x2, const char* str); #else double basic_callback(double x1, double x2, const char* str); #endif void register_basic_callback(double (*fcn)(double x1, double x2, const char* str, void* cookie), void* cookie1); #ifdef IPHREEQC_NO_FORTRAN_MODULE - void register_fortran_basic_callback(double (*fcn)(double* x1, double* x2, char* str, size_t l)); + void register_fortran_basic_callback(double (*fcn)(double* x1, double* x2, const char* str, size_t l)); #else void register_fortran_basic_callback(double (*fcn)(double* x1, double* x2, const char* str, int l)); #endif @@ -1661,7 +1661,7 @@ class Phreeqc double (*basic_callback_ptr) (double x1, double x2, const char* str, void* cookie); void* basic_callback_cookie; #ifdef IPHREEQC_NO_FORTRAN_MODULE - double (*basic_fortran_callback_ptr) (double* x1, double* x2, char* str, size_t l); + double (*basic_fortran_callback_ptr) (double* x1, double* x2, const char* str, size_t l); #else double (*basic_fortran_callback_ptr) (double* x1, double* x2, const char* str, int l); #endif diff --git a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/basicsubs.cpp b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/basicsubs.cpp index d49141da7..c92e8c30c 100644 --- a/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/basicsubs.cpp +++ b/src/IPhreeqcPhast/IPhreeqc/phreeqcpp/basicsubs.cpp @@ -4242,7 +4242,7 @@ basic_callback(double x1, double x2, const char * str) #ifdef IPHREEQC_NO_FORTRAN_MODULE double Phreeqc:: -basic_callback(double x1, double x2, char * str) +basic_callback(double x1, double x2, const char * str) #else double Phreeqc:: basic_callback(double x1, double x2, const char * str) @@ -4253,7 +4253,7 @@ basic_callback(double x1, double x2, const char * str) if (basic_callback_ptr != NULL) { - return (*basic_callback_ptr) (x1, x2, (const char *) str, basic_callback_cookie); + return (*basic_callback_ptr) (x1, x2, str, basic_callback_cookie); } if (basic_fortran_callback_ptr != NULL) { @@ -4274,7 +4274,7 @@ Phreeqc::register_basic_callback(double (*fcn)(double x1, double x2, const char } #ifdef IPHREEQC_NO_FORTRAN_MODULE void -Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, size_t l)) +Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, const char *str, size_t l)) { this->basic_fortran_callback_ptr = fcn; }