Revised name to BasicFortran

Added methods for C call SetBasicCallback.

Need to check C side and documentation.

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@7884 1feff8c3-07ed-0310-ac33-dd36852eb9cd

IPhreeqc.MMS.vcxproj

@@ -507,6 +507,8 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\CVar.hxx" />
+    <ClInclude Include="src\IPhreeqc.h" />
+    <ClInclude Include="src\IPhreeqc.hpp" />
     <ClInclude Include="src\phreeqcpp\cvdense.h" />
     <ClInclude Include="src\phreeqcpp\cvode.h" />
     <ClInclude Include="src\phreeqcpp\cxxKinetics.h" />

IPhreeqc.MMS.vcxproj.filters

@@ -463,6 +463,12 @@
     <ClInclude Include="src\phreeqcpp\Model_eqns.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\IPhreeqc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\IPhreeqc.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="src\IPhreeqcF.f">

src/IPhreeqc.cpp

@@ -728,6 +728,16 @@ int IPhreeqc::RunString(const char* input)
 	return this->PhreeqcPtr->get_input_errors();
 }
 
+void IPhreeqc::SetBasicCallback(double (*cookie)(double *x1, double *x2, char *str))
+{
+	this->PhreeqcPtr->register_basic_callback(cookie);
+}
+
+void IPhreeqc::SetBasicFortranCallback(double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	this->PhreeqcPtr->register_fortran_basic_callback(cookie);
+}
+
 void IPhreeqc::SetDumpFileName(const char *filename)
 {
 	if (filename && ::strlen(filename))
@@ -800,10 +810,6 @@ void IPhreeqc::SetOutputFileOn(bool bValue)
 {
 	this->OutputFileOn = bValue;
 }
-void IPhreeqc::SetFortranBasicCallback(double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	this->PhreeqcPtr->register_fortran_basic_callback(cookie);
-}
 
 void IPhreeqc::SetSelectedOutputFileName(const char *filename)
 {

src/IPhreeqc.f90.inc

@@ -357,6 +357,21 @@
        END INTERFACE
 
 
+       INTERFACE
+        FUNCTION SetBasicFortranCallback(ID,COOKIE)
+         INTEGER(KIND=4),  INTENT(IN) :: ID
+        INTERFACE
+          DOUBLE PRECISION FUNCTION cookie(x1, x2, str)
+            DOUBLE PRECISION, INTENT(in) :: x1
+            DOUBLE PRECISION, INTENT(in) :: x2
+            CHARACTER(*), INTENT(in)                   :: str
+          END FUNCTION 
+        END INTERFACE
+         INTEGER(KIND=4)              :: SetBasicFortranCallback
+        END FUNCTION SetBasicFortranCallback
+       END INTERFACE
+
+
        INTERFACE
         FUNCTION SetDumpFileName(ID,FNAME)
          INTEGER(KIND=4),  INTENT(IN) :: ID
@@ -447,21 +462,6 @@
        END INTERFACE
 
 
-       INTERFACE
-        FUNCTION SetFortranBasicCallback(ID,COOKIE)
-         INTEGER(KIND=4),  INTENT(IN) :: ID
-        INTERFACE
-          DOUBLE PRECISION FUNCTION cookie(x1, x2, str)
-            DOUBLE PRECISION, INTENT(in) :: x1
-            DOUBLE PRECISION, INTENT(in) :: x2
-            CHARACTER(*), INTENT(in)                   :: str
-          END FUNCTION 
-        END INTERFACE
-         INTEGER(KIND=4)              :: SetFortranBasicCallback
-        END FUNCTION SetFortranBasicCallback
-       END INTERFACE
-
-
        INTERFACE
         FUNCTION SetOutputStringOn(ID,OUT_STRING_ON)
          INTEGER(KIND=4),  INTENT(IN) :: ID

src/IPhreeqc.h

@@ -1523,6 +1523,54 @@ Headings
  */
 	IPQ_DLL_EXPORT int         RunString(int id, const char* input);
 
+/**
+ *  Sets C callback function for the Basic interpreter.  
+ *  @param id               The instance id returned from \ref CreateIPhreeqc.
+ *  @param cookie           The name of a double precision Fortran function with three arguments (two double precision, and one character).
+ *  @retval IPQ_OK          Success.
+ *  @retval IPQ_BADINSTANCE The given id is invalid.
+ *  @par Fortran90 Interface:
+ *  @htmlonly
+ *  <CODE>
+ *  <PRE>
+ *  FUNCTION SetBasicCallback(ID,COOKIE)
+ *    INTEGER  :: ID
+ *    double (*cookie)(double *x1, double *x2, 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));
+
+/**
+ *  Sets Fortran callback function for the Basic interpreter.  
+ *  @param id               The instance id returned from \ref CreateIPhreeqc.
+ *  @param cookie           The name of a double precision Fortran function with three arguments (two double precision, and one character).
+ *  @retval IPQ_OK          Success.
+ *  @retval IPQ_BADINSTANCE The given id is invalid.
+ *  @par Fortran90 Interface:
+ *  @htmlonly
+ *  <CODE>
+ *  <PRE>
+ *  FUNCTION SetBasicFortranCallback(ID,COOKIE)
+ *    INTEGER(KIND=4),  INTENT(IN)  :: ID
+ *    INTERFACE
+ *      DOUBLE PRECISION FUNCTION cookie(x1, x2, str)
+ *        DOUBLE PRECISION, INTENT(in) :: x1
+ *        DOUBLE PRECISION, INTENT(in) :: x2
+ *        CHARACTER(*), INTENT(in)                   :: str
+ *      END FUNCTION 
+ *    END INTERFACE
+ *    INTEGER(KIND=4)               :: SetBasicFortranCallback
+ *  END FUNCTION SetBasicCallback
+ *  </PRE>
+ *  </CODE>
+ *  @endhtmlonly
+ */
+	IPQ_DLL_EXPORT IPQ_RESULT  SetBasicFortranCallback(int id, double (*cookie)(double *x1, double *x2, char *str, int l));
+
 
 /**
  *  Sets the name of the dump file.  This file name is used if not specified within <B>DUMP</B> input.
@@ -1808,27 +1856,6 @@ Headings
  */
 	IPQ_DLL_EXPORT IPQ_RESULT  SetOutputFileOn(int id, int output_on);
 
-/**
- *  Sets Fortran callback function for the Basic interpreter.  
- *  @param id               The instance id returned from \ref CreateIPhreeqc.
- *  @param cookie           The name of a double precision Fortran function with three arguments (two double precision, and one character).
- *  @retval IPQ_OK          Success.
- *  @retval IPQ_BADINSTANCE The given id is invalid.
- *  @par Fortran90 Interface:
- *  @htmlonly
- *  <CODE>
- *  <PRE>
- *  FUNCTION SetFortranBasicCallback(ID,COOKIE)
- *    INTEGER(KIND=4),  INTENT(IN)  :: ID
- *    FUNCTION POINTER,  INTENT(IN) :: COOKIE
- *    INTEGER(KIND=4)               :: SetFortranBasicCallback
- *  END FUNCTION SetFortranBasicCallback
- *  </PRE>
- *  </CODE>
- *  @endhtmlonly
- */
-	IPQ_DLL_EXPORT IPQ_RESULT  SetFortranBasicCallback(int id, double (*cookie)(double *x1, double *x2, char *str, int l));
-
 /**
  *  Sets the output string switch on or off.  This switch controls whether or not the data normally sent
  *  to the output file are stored in a buffer for retrieval.  The initial setting after calling

src/IPhreeqc.hpp

@@ -654,6 +654,26 @@ public:
 	 */
 	int                      RunFile(const char* filename);
 
+	/**
+	 *  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)
+	 *  @param cookie           The name of a user-defined function 
+	 *  @see                    SetBasicFortranCallback
+	 */
+	void                     SetBasicCallback(double (*cookie)(double *x1, double *x2, char *str));
+
+	/**
+	 *  Sets a Fortran callback function for Basic programs. The syntax for the Basic command is
+	 *  10 result = CALLBACK(x1, x2, string$)
+	 *  The syntax for the Fortran function is
+	 *  double precision my_callback(x1, x2, string), where x1 and x2 are double precision and string is a character variable.
+	 *  @param cookie           The name of a user-defined double precision function with three arguments (two double precision, one character).
+	 *  @see                    SetBasicCallback
+	 */
+	void                     SetBasicFortranCallback(double (*cookie)(double *x1, double *x2, char *str, int l));
+
 	/**
 	 *  Runs the specified string as input to phreeqc.
 	 *  @param input            String containing phreeqc input.
@@ -756,16 +776,6 @@ public:
 	 */
 	void                     SetOutputFileOn(bool bValue);
 
-	/**
-	 *  Sets a Fortran callback function for Basic programs. The syntax for the Basic command is
-	 *  10 result = CALLBACK(x1, x2, string$)
-	 *  The syntax for the Fortran function is
-	 *  double precision my_callback(x1, x2, string), where x1 and x2 are double precision and string is a character variable.
-	 *  @param cookie           The name of a user-defined double precision function with three arguments (two double precision, one character).
-	 *  @see                    GetOutputFileOn
-	 */
-	void                     SetFortranBasicCallback(double (*cookie)(double *x1, double *x2, char *str, int l));
-
 	/**
 	 *  Sets the output string switch on or off.  This switch controls whether or not the data normally sent
 	 *  to the output file are stored in a buffer for retrieval.  The initial setting is false.

src/IPhreeqcF.f

@@ -433,6 +433,21 @@
         INTEGER(KIND=4)  :: RunStringF
         RunString = RunStringF(ID,INPUT)
       END FUNCTION RunString
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      FUNCTION SetBasicFortranCallback(ID,COOKIE)
+        IMPLICIT NONE
+        INTEGER(KIND=4) :: ID
+        INTERFACE 
+          DOUBLE PRECISION FUNCTION cookie(x1, x2, str)
+            DOUBLE PRECISION, INTENT(in) :: x1
+            DOUBLE PRECISION, INTENT(in) :: x2
+            CHARACTER(*), INTENT(in)                   :: str
+          END FUNCTION 
+        END INTERFACE 
+        INTEGER(KIND=4) :: SetBasicFortranCallback
+        INTEGER(KIND=4) :: SetBasicFortranCallbackF
+        SetBasicFortranCallback = SetBasicFortranCallbackF(ID,COOKIE)
+      END FUNCTION SetBasicFortranCallback          
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       FUNCTION SetDumpFileName(ID,FNAME)
         IMPLICIT NONE
@@ -532,21 +547,6 @@
         INTEGER(KIND=4) :: SetOutputFileOnF
         SetOutputFileOn = SetOutputFileOnF(ID,OUTPUT_FILE_ON)
       END FUNCTION SetOutputFileOn
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      FUNCTION SetFortranBasicCallback(ID,COOKIE)
-        IMPLICIT NONE
-        INTEGER(KIND=4) :: ID
-        INTERFACE 
-          DOUBLE PRECISION FUNCTION cookie(x1, x2, str)
-            DOUBLE PRECISION, INTENT(in) :: x1
-            DOUBLE PRECISION, INTENT(in) :: x2
-            CHARACTER(*), INTENT(in)                   :: str
-          END FUNCTION 
-        END INTERFACE 
-        INTEGER(KIND=4) :: SetFortranBasicCallback
-        INTEGER(KIND=4) :: SetFortranBasicCallbackF
-        SetFortranBasicCallback = SetFortranBasicCallbackF(ID,COOKIE)
-      END FUNCTION SetFortranBasicCallback      
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       FUNCTION SetOutputStringOn(ID,OUTPUT_STRING_ON)
         IMPLICIT NONE

src/IPhreeqcLib.cpp

@@ -714,6 +714,29 @@ RunString(int id, const char* input)
 	return IPQ_BADINSTANCE;
 }
 
+IPQ_RESULT
+SetBasicCallback(int id, double (*cookie)(double *x1, double *x2, char *str))
+{
+	IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
+	if (IPhreeqcPtr)
+	{
+		IPhreeqcPtr->SetBasicCallback(cookie);
+		return IPQ_OK;
+	}
+	return IPQ_BADINSTANCE;
+}
+
+IPQ_RESULT
+SetBasicFortranCallback(int id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
+	if (IPhreeqcPtr)
+	{
+		IPhreeqcPtr->SetBasicFortranCallback(cookie);
+		return IPQ_OK;
+	}
+	return IPQ_BADINSTANCE;
+}
 IPQ_RESULT
 SetDumpFileName(int id, const char* filename)
 {
@@ -846,18 +869,6 @@ SetOutputFileOn(int id, int value)
 	return IPQ_BADINSTANCE;
 }
 
-IPQ_RESULT
-SetFortranBasicCallback(int id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
-	if (IPhreeqcPtr)
-	{
-		IPhreeqcPtr->SetFortranBasicCallback(cookie);
-		return IPQ_OK;
-	}
-	return IPQ_BADINSTANCE;
-}
-
 IPQ_RESULT
 SetOutputStringOn(int id, int value)
 {

src/fwrap.cpp

@@ -449,6 +449,12 @@ RunStringF(int *id, char* input, unsigned int input_length)
 	return n;
 }
 
+IPQ_RESULT
+SetBasicFortranCallbackF(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return ::SetBasicFortranCallback(*id, cookie);
+}
+
 IPQ_RESULT
 SetDumpFileNameF(int *id, char* fname, unsigned int fname_length)
 {
@@ -559,11 +565,6 @@ SetOutputFileOnF(int *id, int* output_on)
 	return ::SetOutputFileOn(*id, *output_on);
 }
 
-IPQ_RESULT
-SetFortranBasicCallbackF(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return ::SetFortranBasicCallback(*id, cookie);
-}
 IPQ_RESULT
 SetOutputStringOnF(int *id, int* output_string_on)
 {
@@ -798,6 +799,10 @@ IPQ_DLL_EXPORT int  __stdcall RUNSTRING(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  __stdcall SETBASICFORTRANCALBACK(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  __stdcall SETDUMPFILENAME(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -842,10 +847,6 @@ IPQ_DLL_EXPORT int  __stdcall SETOUTPUTFILEON(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  __stdcall SETFORTRANBASICCALBACK(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  __stdcall SETOUTPUTSTRINGON(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);

src/fwrap.h

@@ -69,7 +69,7 @@
 #define SetSelectedOutputFileNameF        FC_FUNC (setselectedoutputfilenamef,        SETSELECTEDOUTPUTFILENAMEF)
 #define SetSelectedOutputFileOnF          FC_FUNC (setselectedoutputfileonf,          SETSELECTEDOUTPUTFILEONF)
 #define SetSelectedOutputStringOnF        FC_FUNC (setselectedoutputstringonf,        SETSELECTEDOUTPUTSTRINGONF)
-#define SetFortranBasicCallbackF          FC_FUNC (setfortranbasiccallbackf,          SETFOTRANBASICCALLBACKF)
+#define SetBasicFortranCallbackF          FC_FUNC (setbasicfortrancallbackf,          SETFOTRANBASICCALLBACKF)
 #endif /* FC_FUNC */
 
 #if defined(__cplusplus)
@@ -137,7 +137,7 @@ extern "C" {
   IPQ_RESULT SetSelectedOutputFileNameF(int *id, char* fname, unsigned int fname_length);
   IPQ_RESULT SetSelectedOutputFileOnF(int *id, int* selected_output_file_on);
   IPQ_RESULT SetSelectedOutputStringOnF(int *id, int* selected_output_string_on);
-  IPQ_RESULT SetFortranBasicCallbackF(int *id, double (*cookie)(double *x1, double *x2, char *str, int l));
+  IPQ_RESULT SetBasicFortranCallbackF(int *id, double (*cookie)(double *x1, double *x2, char *str, int l));
 
 #if defined(__cplusplus)
 }

src/fwrap2.cpp

@@ -199,6 +199,10 @@ IPQ_DLL_EXPORT int  RUNSTRING(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  SETBASICFORTRANCALLBACK(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  SETDUMPFILENAME(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -243,10 +247,6 @@ IPQ_DLL_EXPORT int  SETOUTPUTFILEON(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  SETFORTRANBASICCALLBACK(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  SETOUTPUTSTRINGON(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);

src/fwrap3.cpp

@@ -200,6 +200,10 @@ IPQ_DLL_EXPORT int  runstring_(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  setbasicfortrancallback_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  setdumpfilename_(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -244,10 +248,6 @@ IPQ_DLL_EXPORT int  setoutputfileon_(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  setfortranbasiccallback_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  setoutputstringon_(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);

src/fwrap4.cpp

@@ -200,6 +200,10 @@ IPQ_DLL_EXPORT int  runstring(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  setbasicfortrancallback(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  setdumpfilename(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -244,10 +248,6 @@ IPQ_DLL_EXPORT int  setoutputfileon(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  setfortranbasiccallback(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  setoutputstringon(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);

src/fwrap5.cpp

@@ -200,6 +200,10 @@ IPQ_DLL_EXPORT int  RUNSTRING_(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  SETBASICFORTRANCALLBACK_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -244,10 +248,6 @@ IPQ_DLL_EXPORT int  SETOUTPUTFILEON_(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  SETFORTRANBASICCALLBACK_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  SETOUTPUTSTRINGON_(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);

src/fwrap6.cpp

@@ -201,6 +201,10 @@ IPQ_DLL_EXPORT int  __stdcall RUNSTRING_(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  __stdcall SETBASICFORTRANCALLBACK_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  __stdcall SETDUMPFILENAME_(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -245,10 +249,6 @@ IPQ_DLL_EXPORT int  __stdcall SETOUTPUTFILEON_(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  __stdcall SETFORTRANBASICCALLBACK_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  __stdcall SETOUTPUTSTRINGON_(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);

src/fwrap7.cpp

@@ -200,6 +200,10 @@ IPQ_DLL_EXPORT int  __stdcall runstring_(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  __stdcall setbasicfortrancallback_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  __stdcall setdumpfilename_(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -244,10 +248,6 @@ IPQ_DLL_EXPORT int  __stdcall setoutputfileon_(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  __stdcall setfortranbasiccallback_(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  __stdcall setoutputstringon_(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);

src/fwrap8.cpp

@@ -200,6 +200,10 @@ IPQ_DLL_EXPORT int  __stdcall runstring(int *id, char *input, unsigned int len)
 {
 	return RunStringF(id, input, len);
 }
+IPQ_DLL_EXPORT int  __stdcall setbasicfortrancallback(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
+{
+	return SetBasicFortranCallbackF(id, cookie);
+}
 IPQ_DLL_EXPORT int  __stdcall setdumpfilename(int *id, char *filename, unsigned int len)
 {
 	return SetDumpFileNameF(id, filename, len);
@@ -244,10 +248,6 @@ IPQ_DLL_EXPORT int  __stdcall setoutputfileon(int *id, int *output_on)
 {
 	return SetOutputFileOnF(id, output_on);
 }
-IPQ_DLL_EXPORT int  __stdcall setfortranbasiccallback(int *id, double (*cookie)(double *x1, double *x2, char *str, int l))
-{
-	return SetFortranBasicCallbackF(id, cookie);
-}
 IPQ_DLL_EXPORT int  __stdcall setoutputstringon(int *id, int *output_on)
 {
 	return SetOutputStringOnF(id, output_on);