max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-16 08:38:23 +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/IPhreeqc/trunk@9463 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2015-04-02 22:59:33 +00:00
parent 40c8ebdae6
commit f31a2c2679
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/IPhreeqc.cpp
View File

@ -879,7 +879,7 @@ void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, cha
this->PhreeqcPtr->register_fortran_basic_callback(fcn); this->PhreeqcPtr->register_fortran_basic_callback(fcn);
} }
#else #else
void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, int l)) void IPhreeqc::SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, const char *str, int l))
{ {
this->PhreeqcPtr->register_fortran_basic_callback(fcn); this->PhreeqcPtr->register_fortran_basic_callback(fcn);
} }

2
src/IPhreeqc.h
View File

@ -1666,7 +1666,7 @@ Headings
#ifdef IPHREEQC_NO_FORTRAN_MODULE #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, char *str, size_t l));
#else #else
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, int l)); IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, const char *str, int l));
#endif #endif

2
src/IPhreeqc.hpp
View File

@ -713,7 +713,7 @@ public:
#ifdef IPHREEQC_NO_FORTRAN_MODULE #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, char *str, size_t l));
#else #else
void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, char *str, int l)); void SetBasicFortranCallback(double (*fcn)(double *x1, double *x2, const char *str, int l));
#endif #endif
/** /**

2
src/IPhreeqcLib.cpp
View File

@ -795,7 +795,7 @@ SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str,
} }
#else #else
IPQ_RESULT IPQ_RESULT
SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, char *str, int l)) SetBasicFortranCallback(int id, double (*fcn)(double *x1, double *x2, const char *str, int l))
{ {
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)

2
src/IPhreeqc_interface_F.cpp
View File

@ -410,7 +410,7 @@ SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *st
} }
#else #else
IPQ_RESULT IPQ_RESULT
SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, int l)) SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, const char *str, int l))
{ {
return ::SetBasicFortranCallback(*id, fcn); return ::SetBasicFortranCallback(*id, fcn);
} }

2
src/IPhreeqc_interface_F.h
View File

@ -136,7 +136,7 @@ extern "C" {
#ifdef IPHREEQC_NO_FORTRAN_MODULE #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, char *str, size_t l));
#else #else
IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, char *str, int l)); IPQ_DLL_EXPORT IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*fcn)(double *x1, double *x2, const char *str, int l));
#endif #endif
IPQ_DLL_EXPORT IPQ_RESULT SetCurrentSelectedOutputUserNumberF(int *id, int *n); IPQ_DLL_EXPORT IPQ_RESULT SetCurrentSelectedOutputUserNumberF(int *id, int *n);
IPQ_DLL_EXPORT IPQ_RESULT SetDumpFileNameF(int *id, char* fname); IPQ_DLL_EXPORT IPQ_RESULT SetDumpFileNameF(int *id, char* fname);