From e84db2efc30bd01b190f715ce9191c5fcacc9097 Mon Sep 17 00:00:00 2001 From: Darth Vader Date: Thu, 15 Aug 2024 17:12:35 +0000 Subject: [PATCH] Squashed 'src/' changes from b6a23a24..faf81447 faf81447 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57) git-subtree-dir: src git-subtree-split: faf81447ee82e86ce3b2cb9d71fd81316cccfd9f --- Phreeqc.h | 6 +++--- basicsubs.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Phreeqc.h b/Phreeqc.h index 5607f2bca..ddff8262b 100644 --- a/Phreeqc.h +++ b/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/basicsubs.cpp b/basicsubs.cpp index d49141da7..c92e8c30c 100644 --- a/basicsubs.cpp +++ b/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; }