max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 00:28:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'phreeqcpp/' changes from b6a23a2..faf8144

Browse Source 
faf8144 50 apple clang 15 with c++11 or higher reports warnings wwritable strings in pbasiccpp (#57)

git-subtree-dir: phreeqcpp
git-subtree-split: faf81447ee82e86ce3b2cb9d71fd81316cccfd9f
This commit is contained in:
Darth Vader 2024-08-15 17:08:49 +00:00
parent 88d5ec2035
commit c1c1f286b6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Phreeqc.h
View File

@ -93,13 +93,13 @@ public:
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 @@ protected:
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

6
basicsubs.cpp
View File

@ -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;
}