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

Fixed post-build in project

Browse Source 
Phreeqc.h was jacked up??? The has_infinite block did not end until the end of the file.

Made the arguments for the C callback double, double, const char *.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7888 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
David L Parkhurst 2013-08-07 17:01:30 +00:00
parent dc6d21b5ae
commit 9212e8f18d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IPhreeqc.cpp
View File

@ -728,7 +728,7 @@ int IPhreeqc::RunString(const char* input)
return this->PhreeqcPtr->get_input_errors();
}
void IPhreeqc::SetBasicCallback(double (*cookie)(double *x1, double *x2, char *str))
void IPhreeqc::SetBasicCallback(double (*cookie)(double x1, double x2, const char *str))
{
this->PhreeqcPtr->register_basic_callback(cookie);
}

4
IPhreeqc.h
View File

@ -1535,14 +1535,14 @@ Headings
* <PRE>
* FUNCTION SetBasicCallback(ID,COOKIE)
* INTEGER :: ID
* double (*cookie)(double *x1, double *x2, char *str)
* double (*cookie)(double x1, double x2, const char *str)
* INTEGER :: SetBasicCallback
* END FUNCTION SetBasicCallback
* </PRE>
* </CODE>
* @endhtmlonly
*/
IPQ_DLL_EXPORT IPQ_RESULT SetBasicCallback(int id, double (*cookie)(double *x1, double *x2, char *str));
IPQ_DLL_EXPORT IPQ_RESULT SetBasicCallback(int id, double (*cookie)(double x1, double x2, const char *str));
/**
* Sets Fortran callback function for the Basic interpreter.

4
IPhreeqc.hpp
View File

@ -658,11 +658,11 @@ public:
* Sets a C callback function for Basic programs. The syntax for the Basic command is
* 10 result = CALLBACK(x1, x2, string$)
* The syntax for the C function is
* double my_callback(double x1, double x2, char * string)
* double my_callback(double x1, double x2, const char * string)
* @param cookie The name of a user-defined function
* @see SetBasicFortranCallback
*/
void SetBasicCallback(double (*cookie)(double *x1, double *x2, char *str));
void SetBasicCallback(double (*cookie)(double x1, double x2, const char *str));
/**
* Sets a Fortran callback function for Basic programs. The syntax for the Basic command is

2
IPhreeqcLib.cpp
View File

@ -715,7 +715,7 @@ RunString(int id, const char* input)
}
IPQ_RESULT
SetBasicCallback(int id, double (*cookie)(double *x1, double *x2, char *str))
SetBasicCallback(int id, double (*cookie)(double x1, double x2, const char *str))
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)