Fixed post-build in project

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 06d4b78d2f
commit 0018c3c5c9
5 changed files with 7 additions and 7 deletions

View File

@ -246,7 +246,7 @@ copy "$(OutDir)$(TargetName)$(TargetExt)" "libx64\$(TargetName)$(TargetExt)"</Co
<PostBuildEvent> <PostBuildEvent>
<Command>IF NOT EXIST lib mkdir lib <Command>IF NOT EXIST lib mkdir lib
copy "$(OutDir)$(TargetName)$(TargetExt)" "lib\$(TargetName)$(TargetExt)" copy "$(OutDir)$(TargetName)$(TargetExt)" "lib\$(TargetName)$(TargetExt)"
copy "$(OutDir)vc100.pdb" "lib\vc100.pdb"</Command> copy "$(OutDir)vc110.pdb" "lib\vc110.pdb"</Command>
</PostBuildEvent> </PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

View File

@ -728,7 +728,7 @@ int IPhreeqc::RunString(const char* input)
return this->PhreeqcPtr->get_input_errors(); 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); this->PhreeqcPtr->register_basic_callback(cookie);
} }

View File

@ -1535,14 +1535,14 @@ Headings
* <PRE> * <PRE>
* FUNCTION SetBasicCallback(ID,COOKIE) * FUNCTION SetBasicCallback(ID,COOKIE)
* INTEGER :: ID * INTEGER :: ID
* double (*cookie)(double *x1, double *x2, char *str) * double (*cookie)(double x1, double x2, const char *str)
* INTEGER :: SetBasicCallback * INTEGER :: SetBasicCallback
* END FUNCTION SetBasicCallback * END FUNCTION SetBasicCallback
* </PRE> * </PRE>
* </CODE> * </CODE>
* @endhtmlonly * @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. * Sets Fortran callback function for the Basic interpreter.

View File

@ -658,11 +658,11 @@ public:
* Sets a C callback function for Basic programs. The syntax for the Basic command is * Sets a C callback function for Basic programs. The syntax for the Basic command is
* 10 result = CALLBACK(x1, x2, string$) * 10 result = CALLBACK(x1, x2, string$)
* The syntax for the C function is * 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 * @param cookie The name of a user-defined function
* @see SetBasicFortranCallback * @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 * Sets a Fortran callback function for Basic programs. The syntax for the Basic command is

View File

@ -715,7 +715,7 @@ RunString(int id, const char* input)
} }
IPQ_RESULT 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); IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr) if (IPhreeqcPtr)