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

len=l for callback fortran string.

Browse Source 
Made basic callback string a "const" in 8 places.


git-svn-id: svn://136.177.114.72/svn_GW/phreeqc3/trunk@9463 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-04-02 22:59:33 +00:00
parent 678fd85c15
commit 18f0512be6
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Phreeqc.h
View File

@ -84,12 +84,12 @@ public:
int basic_compile(char *commands, void **lnbase, void **vbase, void **lpbase);
int basic_run(char *commands, void *lnbase, void *vbase, void *lpbase);
void basic_free(void);
double basic_callback(double x1, double x2, char * str);
double basic_callback(double x1, double x2, const char * str);
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));
#else
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, int l));
void register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, const char *str, int l));
#endif
LDBLE activity(const char *species_name);
@ -1725,7 +1725,7 @@ protected:
#ifdef IPHREEQC_NO_FORTRAN_MODULE
double (*basic_fortran_callback_ptr) (double *x1, double *x2, char *str, size_t l);
#else
double (*basic_fortran_callback_ptr) (double *x1, double *x2, char *str, int l);
double (*basic_fortran_callback_ptr) (double *x1, double *x2, const char *str, int l);
#endif
/* cl1.cpp ------------------------------- */

4
basicsubs.cpp
View File

@ -3904,7 +3904,7 @@ basic_free(void)
}
double Phreeqc::
basic_callback(double x1, double x2, char * str)
basic_callback(double x1, double x2, const char * str)
{
double local_x1 = x1;
double local_x2 = x2;
@ -3939,7 +3939,7 @@ Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2,
#else
void
Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, char *str, int l))
Phreeqc::register_fortran_basic_callback(double ( *fcn)(double *x1, double *x2, const char *str, int l))
{
this->basic_fortran_callback_ptr = fcn;
}