mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-16 00:28:23 +01:00
removed UnLoadDatabase from public API
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4449 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
f8f24e1c78
commit
556b588e64
@ -344,11 +344,3 @@
|
||||
INTEGER(KIND=4) :: SetSelOutFileOnF
|
||||
SetSelectedOutputFileOn = SetSelOutFileOnF(ID,SELECTED_ON)
|
||||
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
|
||||
|
||||
@ -543,18 +543,6 @@ SetSelectedOutputFileOn(int id, int value)
|
||||
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
|
||||
//
|
||||
|
||||
|
||||
11
fwrap.cpp
11
fwrap.cpp
@ -391,13 +391,6 @@ SetSelOutFileOnF(int *id, int* sel_on)
|
||||
return ::SetSelectedOutputFileOn(*id, *sel_on);
|
||||
}
|
||||
|
||||
int
|
||||
UnLoadDatabaseF(int *id)
|
||||
{
|
||||
return ::UnLoadDatabase(*id);
|
||||
}
|
||||
|
||||
|
||||
#if defined(_WIN32) && !defined(_M_AMD64)
|
||||
|
||||
#if defined(__cplusplus)
|
||||
@ -558,10 +551,6 @@ IPQ_DLL_EXPORT void __stdcall SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
|
||||
{
|
||||
SetSelOutFileOnF(id, selected_on);
|
||||
}
|
||||
IPQ_DLL_EXPORT int __stdcall UNLOADDATABASE(int *id)
|
||||
{
|
||||
return UnLoadDatabaseF(id);
|
||||
}
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
2
fwrap.h
2
fwrap.h
@ -45,7 +45,6 @@
|
||||
#define SetLogFileOnF FC_FUNC (setlogfileonf, SETLOGFILEONF)
|
||||
#define SetOutputFileOnF FC_FUNC (setoutputfileonf, SETOUTPUTFILEONF)
|
||||
#define SetSelOutFileOnF FC_FUNC (setseloutfileonf, SETSELOUTFILEONF)
|
||||
#define UnLoadDatabaseF FC_FUNC (unloaddatabasef, UNLOADDATABASEF)
|
||||
#endif /* FC_FUNC */
|
||||
|
||||
#if defined(__cplusplus)
|
||||
@ -89,7 +88,6 @@ extern "C" {
|
||||
IPQ_RESULT SetLogFileOnF(int *id, int* log_on);
|
||||
IPQ_RESULT SetOutputFileOnF(int *id, int* output_on);
|
||||
IPQ_RESULT SetSelOutFileOnF(int *id, int* selected_output_on);
|
||||
int UnLoadDatabaseF(int *id);
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
|
||||
@ -160,10 +160,6 @@ IPQ_DLL_EXPORT void SETSELECTEDOUTPUTFILEON(int *id, int *selected_on)
|
||||
{
|
||||
SetSelOutFileOnF(id, selected_on);
|
||||
}
|
||||
IPQ_DLL_EXPORT int UNLOADDATABASE(int *id)
|
||||
{
|
||||
return UnLoadDatabaseF(id);
|
||||
}
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
|
||||
@ -161,10 +161,6 @@ IPQ_DLL_EXPORT void setselectedoutputfileon_(int *id, int *selected_on)
|
||||
{
|
||||
SetSelOutFileOnF(id, selected_on);
|
||||
}
|
||||
IPQ_DLL_EXPORT int unloaddatabase_(int *id)
|
||||
{
|
||||
return UnLoadDatabaseF(id);
|
||||
}
|
||||
|
||||
#if defined(__cplusplus)
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user