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

removed UnLoadDatabase from public API

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4449 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2010-05-21 05:01:07 +00:00
parent f8f24e1c78
commit 556b588e64
6 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IPhreeqcF.f
View File

@ -344,11 +344,3 @@
INTEGER(KIND=4) :: SetSelOutFileOnF INTEGER(KIND=4) :: SetSelOutFileOnF
SetSelectedOutputFileOn = SetSelOutFileOnF(ID,SELECTED_ON) SetSelectedOutputFileOn = SetSelOutFileOnF(ID,SELECTED_ON)
END FUNCTION SetSelectedOutputFileOn END FUNCTION SetSelectedOutputFileOn
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
FUNCTION UnLoadDatabase(ID)
IMPLICIT NONE
INTEGER(KIND=4) :: ID
INTEGER(KIND=4) :: UnLoadDatabase
INTEGER(KIND=4) :: UnLoadDatabaseF
UnLoadDatabase = UnLoadDatabaseF(ID)
END FUNCTION UnLoadDatabase

12
IPhreeqcLib.cpp
View File

@ -543,18 +543,6 @@ SetSelectedOutputFileOn(int id, int value)
return IPQ_BADINSTANCE; return IPQ_BADINSTANCE;
} }
IPQ_RESULT
UnLoadDatabase(int id)
{
IPhreeqc* IPhreeqcPtr = IPhreeqcLib::GetInstance(id);
if (IPhreeqcPtr)
{
IPhreeqcPtr->UnLoadDatabase();
return IPQ_OK;
}
return IPQ_BADINSTANCE;
}
// helper functions // helper functions
// //

11
fwrap.cpp
View File

@ -391,13 +391,6 @@ SetSelOutFileOnF(int *id, int* sel_on)
return ::SetSelectedOutputFileOn(*id, *sel_on); return ::SetSelectedOutputFileOn(*id, *sel_on);
} }
int
UnLoadDatabaseF(int *id)
{
return ::UnLoadDatabase(*id);
}
#if defined(_WIN32) && !defined(_M_AMD64) #if defined(_WIN32) && !defined(_M_AMD64)
#if defined(__cplusplus) #if defined(__cplusplus)
@ -558,10 +551,6 @@ IPQ_DLL_EXPORT void __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
{ {
SetSelOutFileOnF(id, selected_on); SetSelOutFileOnF(id, selected_on);
} }
IPQ_DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
{
return UnLoadDatabaseF(id);
}
#if defined(__cplusplus) #if defined(__cplusplus)
} }
#endif #endif

2
fwrap.h
View File

@ -45,7 +45,6 @@
#define SetLogFileOnF FC_FUNC (setlogfileonf, SETLOGFILEONF) #define SetLogFileOnF FC_FUNC (setlogfileonf, SETLOGFILEONF)
#define SetOutputFileOnF FC_FUNC (setoutputfileonf, SETOUTPUTFILEONF) #define SetOutputFileOnF FC_FUNC (setoutputfileonf, SETOUTPUTFILEONF)
#define SetSelOutFileOnF FC_FUNC (setseloutfileonf, SETSELOUTFILEONF) #define SetSelOutFileOnF FC_FUNC (setseloutfileonf, SETSELOUTFILEONF)
#define UnLoadDatabaseF FC_FUNC (unloaddatabasef, UNLOADDATABASEF)
#endif /* FC_FUNC */ #endif /* FC_FUNC */
#if defined(__cplusplus) #if defined(__cplusplus)
@ -89,7 +88,6 @@ extern "C" {
IPQ_RESULT SetLogFileOnF(int *id, int* log_on); IPQ_RESULT SetLogFileOnF(int *id, int* log_on);
IPQ_RESULT SetOutputFileOnF(int *id, int* output_on); IPQ_RESULT SetOutputFileOnF(int *id, int* output_on);
IPQ_RESULT SetSelOutFileOnF(int *id, int* selected_output_on); IPQ_RESULT SetSelOutFileOnF(int *id, int* selected_output_on);
int UnLoadDatabaseF(int *id);
#if defined(__cplusplus) #if defined(__cplusplus)
} }

4
fwrap2.cpp
View File

@ -160,10 +160,6 @@ IPQ_DLL_EXPORT void SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
{ {
SetSelOutFileOnF(id, selected_on); SetSelOutFileOnF(id, selected_on);
} }
IPQ_DLL_EXPORT int UNLOADDATABASE(int *id)
{
return UnLoadDatabaseF(id);
}
#if defined(__cplusplus) #if defined(__cplusplus)
} }

4
fwrap3.cpp
View File

@ -161,10 +161,6 @@ IPQ_DLL_EXPORT void setselectedoutputfileon_(int *id, int *selected_on)
{ {
SetSelOutFileOnF(id, selected_on); SetSelOutFileOnF(id, selected_on);
} }
IPQ_DLL_EXPORT int unloaddatabase_(int *id)
{
return UnLoadDatabaseF(id);
}
#if defined(__cplusplus) #if defined(__cplusplus)
} }