Remove the (char *) casts and take const char *

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>
This commit is contained in:
Ian Bell
2014-12-08 22:12:23 -05:00
parent 058ca162d2
commit 57afce4ce4

View File

@@ -219,7 +219,7 @@ static char default_reference_state[] = "DEF";
XMASSdll_POINTER XMASSdll;
XMOLEdll_POINTER XMOLEdll;
void *getFunctionPointer(char * name)
void *getFunctionPointer(const char * name)
{
#if defined(__ISWINDOWS__)
return (void *) GetProcAddress(RefpropdllInstance,name);
@@ -247,103 +247,103 @@ double setFunctionPointers()
return -_HUGE;
}
// set the pointers, platform independent
RPVersion = (RPVersion_POINTER) getFunctionPointer((char *)RPVersion_NAME);
ABFL1dll = (ABFL1dll_POINTER) getFunctionPointer((char *)ABFL1dll_NAME);
ABFL2dll = (ABFL2dll_POINTER) getFunctionPointer((char *)ABFL2dll_NAME);
ACTVYdll = (ACTVYdll_POINTER) getFunctionPointer((char *)ACTVYdll_NAME);
AGdll = (AGdll_POINTER) getFunctionPointer((char *)AGdll_NAME);
CCRITdll = (CCRITdll_POINTER) getFunctionPointer((char *)CCRITdll_NAME);
CP0dll = (CP0dll_POINTER) getFunctionPointer((char *)CP0dll_NAME);
CRITPdll = (CRITPdll_POINTER) getFunctionPointer((char *)CRITPdll_NAME);
CSATKdll = (CSATKdll_POINTER) getFunctionPointer((char *)CSATKdll_NAME);
CV2PKdll = (CV2PKdll_POINTER) getFunctionPointer((char *)CV2PKdll_NAME);
CVCPKdll = (CVCPKdll_POINTER) getFunctionPointer((char *)CVCPKdll_NAME);
CVCPdll = (CVCPdll_POINTER) getFunctionPointer((char *)CVCPdll_NAME);
DBDTdll = (DBDTdll_POINTER) getFunctionPointer((char *)DBDTdll_NAME);
DBFL1dll = (DBFL1dll_POINTER) getFunctionPointer((char *)DBFL1dll_NAME);
DBFL2dll = (DBFL2dll_POINTER) getFunctionPointer((char *)DBFL2dll_NAME);
DDDPdll = (DDDPdll_POINTER) getFunctionPointer((char *)DDDPdll_NAME);
DDDTdll = (DDDTdll_POINTER) getFunctionPointer((char *)DDDTdll_NAME);
DEFLSHdll = (DEFLSHdll_POINTER) getFunctionPointer((char *)DEFLSHdll_NAME);
DHD1dll = (DHD1dll_POINTER) getFunctionPointer((char *)DHD1dll_NAME);
DHFLSHdll = (DHFLSHdll_POINTER) getFunctionPointer((char *)DHFLSHdll_NAME);
DIELECdll = (DIELECdll_POINTER) getFunctionPointer((char *)DIELECdll_NAME);
DOTFILLdll = (DOTFILLdll_POINTER) getFunctionPointer((char *)DOTFILLdll_NAME);
DPDD2dll = (DPDD2dll_POINTER) getFunctionPointer((char *)DPDD2dll_NAME);
DPDDKdll = (DPDDKdll_POINTER) getFunctionPointer((char *)DPDDKdll_NAME);
DPDDdll = (DPDDdll_POINTER) getFunctionPointer((char *)DPDDdll_NAME);
DPDTKdll = (DPDTKdll_POINTER) getFunctionPointer((char *)DPDTKdll_NAME);
DPDTdll = (DPDTdll_POINTER) getFunctionPointer((char *)DPDTdll_NAME);
DPTSATKdll = (DPTSATKdll_POINTER) getFunctionPointer((char *)DPTSATKdll_NAME);
DSFLSHdll = (DSFLSHdll_POINTER) getFunctionPointer((char *)DSFLSHdll_NAME);
ENTHALdll = (ENTHALdll_POINTER) getFunctionPointer((char *)ENTHALdll_NAME);
ENTROdll = (ENTROdll_POINTER) getFunctionPointer((char *)ENTROdll_NAME);
ESFLSHdll = (ESFLSHdll_POINTER) getFunctionPointer((char *)ESFLSHdll_NAME);
FGCTYdll = (FGCTYdll_POINTER) getFunctionPointer((char *)FGCTYdll_NAME);
FPVdll = (FPVdll_POINTER) getFunctionPointer((char *)FPVdll_NAME);
FUGCOFdll = (FUGCOFdll_POINTER) getFunctionPointer((char *)FUGCOFdll_NAME);
GERG04dll = (GERG04dll_POINTER) getFunctionPointer((char *)GERG04dll_NAME);
GETFIJdll = (GETFIJdll_POINTER) getFunctionPointer((char *)GETFIJdll_NAME);
GETKTVdll = (GETKTVdll_POINTER) getFunctionPointer((char *)GETKTVdll_NAME);
GIBBSdll = (GIBBSdll_POINTER) getFunctionPointer((char *)GIBBSdll_NAME);
HSFLSHdll = (HSFLSHdll_POINTER) getFunctionPointer((char *)HSFLSHdll_NAME);
INFOdll = (INFOdll_POINTER) getFunctionPointer((char *)INFOdll_NAME);
LIMITKdll = (LIMITKdll_POINTER) getFunctionPointer((char *)LIMITKdll_NAME);
LIMITSdll = (LIMITSdll_POINTER) getFunctionPointer((char *)LIMITSdll_NAME);
LIMITXdll = (LIMITXdll_POINTER) getFunctionPointer((char *)LIMITXdll_NAME);
MELTPdll = (MELTPdll_POINTER) getFunctionPointer((char *)MELTPdll_NAME);
MELTTdll = (MELTTdll_POINTER) getFunctionPointer((char *)MELTTdll_NAME);
MLTH2Odll = (MLTH2Odll_POINTER) getFunctionPointer((char *)MLTH2Odll_NAME);
NAMEdll = (NAMEdll_POINTER) getFunctionPointer((char *)NAMEdll_NAME);
PDFL1dll = (PDFL1dll_POINTER) getFunctionPointer((char *)PDFL1dll_NAME);
PDFLSHdll = (PDFLSHdll_POINTER) getFunctionPointer((char *)PDFLSHdll_NAME);
PEFLSHdll = (PEFLSHdll_POINTER) getFunctionPointer((char *)PEFLSHdll_NAME);
PHFL1dll = (PHFL1dll_POINTER) getFunctionPointer((char *)PHFL1dll_NAME);
PHFLSHdll = (PHFLSHdll_POINTER) getFunctionPointer((char *)PHFLSHdll_NAME);
PQFLSHdll = (PQFLSHdll_POINTER) getFunctionPointer((char *)PQFLSHdll_NAME);
PREOSdll = (PREOSdll_POINTER) getFunctionPointer((char *)PREOSdll_NAME);
PRESSdll = (PRESSdll_POINTER) getFunctionPointer((char *)PRESSdll_NAME);
PSFL1dll = (PSFL1dll_POINTER) getFunctionPointer((char *)PSFL1dll_NAME);
PSFLSHdll = (PSFLSHdll_POINTER) getFunctionPointer((char *)PSFLSHdll_NAME);
PUREFLDdll = (PUREFLDdll_POINTER) getFunctionPointer((char *)PUREFLDdll_NAME);
RESIDUALdll = (RESIDUALdll_POINTER) getFunctionPointer((char *)RESIDUALdll_NAME);
QMASSdll = (QMASSdll_POINTER) getFunctionPointer((char *)QMASSdll_NAME);
QMOLEdll = (QMOLEdll_POINTER) getFunctionPointer((char *)QMOLEdll_NAME);
SATDdll = (SATDdll_POINTER) getFunctionPointer((char *)SATDdll_NAME);
SATEdll = (SATEdll_POINTER) getFunctionPointer((char *)SATEdll_NAME);
SATHdll = (SATHdll_POINTER) getFunctionPointer((char *)SATHdll_NAME);
SATPdll = (SATPdll_POINTER) getFunctionPointer((char *)SATPdll_NAME);
SATSdll = (SATSdll_POINTER) getFunctionPointer((char *)SATSdll_NAME);
SATTdll = (SATTdll_POINTER) getFunctionPointer((char *)SATTdll_NAME);
SATSPLNdll = (SATSPLNdll_POINTER) getFunctionPointer((char *)SATSPLNdll_NAME);
SETAGAdll = (SETAGAdll_POINTER) getFunctionPointer((char *)SETAGAdll_NAME);
SETKTVdll = (SETKTVdll_POINTER) getFunctionPointer((char *)SETKTVdll_NAME);
SETMIXdll = (SETMIXdll_POINTER) getFunctionPointer((char *)SETMIXdll_NAME);
SETMODdll = (SETMODdll_POINTER) getFunctionPointer((char *)SETMODdll_NAME);
SETREFdll = (SETREFdll_POINTER) getFunctionPointer((char *)SETREFdll_NAME);
SETUPdll = (SETUPdll_POINTER) getFunctionPointer((char *)SETUPdll_NAME);
// SPECGRdll = (SPECGRdll_POINTER) getFunctionPointer((char *)SPECGRdll_NAME); // not in library
SUBLPdll = (SUBLPdll_POINTER) getFunctionPointer((char *)SUBLPdll_NAME);
SUBLTdll = (SUBLTdll_POINTER) getFunctionPointer((char *)SUBLTdll_NAME);
SURFTdll = (SURFTdll_POINTER) getFunctionPointer((char *)SURFTdll_NAME);
SURTENdll = (SURTENdll_POINTER) getFunctionPointer((char *)SURTENdll_NAME);
TDFLSHdll = (TDFLSHdll_POINTER) getFunctionPointer((char *)TDFLSHdll_NAME);
TEFLSHdll = (TEFLSHdll_POINTER) getFunctionPointer((char *)TEFLSHdll_NAME);
THERM0dll = (THERM0dll_POINTER) getFunctionPointer((char *)THERM0dll_NAME);
THERM2dll = (THERM2dll_POINTER) getFunctionPointer((char *)THERM2dll_NAME);
THERM3dll = (THERM3dll_POINTER) getFunctionPointer((char *)THERM3dll_NAME);
THERMdll = (THERMdll_POINTER) getFunctionPointer((char *)THERMdll_NAME);
THFLSHdll = (THFLSHdll_POINTER) getFunctionPointer((char *)THFLSHdll_NAME);
TPFLSHdll = (TPFLSHdll_POINTER) getFunctionPointer((char *)TPFLSHdll_NAME);
TPRHOdll = (TPRHOdll_POINTER) getFunctionPointer((char *)TPRHOdll_NAME);
TQFLSHdll = (TQFLSHdll_POINTER) getFunctionPointer((char *)TQFLSHdll_NAME);
TRNPRPdll = (TRNPRPdll_POINTER) getFunctionPointer((char *)TRNPRPdll_NAME);
TSFLSHdll = (TSFLSHdll_POINTER) getFunctionPointer((char *)TSFLSHdll_NAME);
VIRBdll = (VIRBdll_POINTER) getFunctionPointer((char *)VIRBdll_NAME);
VIRCdll = (VIRCdll_POINTER) getFunctionPointer((char *)VIRCdll_NAME);
WMOLdll = (WMOLdll_POINTER) getFunctionPointer((char *)WMOLdll_NAME);
XMASSdll = (XMASSdll_POINTER) getFunctionPointer((char *)XMASSdll_NAME);
XMOLEdll = (XMOLEdll_POINTER) getFunctionPointer((char *)XMOLEdll_NAME);
RPVersion = (RPVersion_POINTER) getFunctionPointer(RPVersion_NAME);
ABFL1dll = (ABFL1dll_POINTER) getFunctionPointer(ABFL1dll_NAME);
ABFL2dll = (ABFL2dll_POINTER) getFunctionPointer(ABFL2dll_NAME);
ACTVYdll = (ACTVYdll_POINTER) getFunctionPointer(ACTVYdll_NAME);
AGdll = (AGdll_POINTER) getFunctionPointer(AGdll_NAME);
CCRITdll = (CCRITdll_POINTER) getFunctionPointer(CCRITdll_NAME);
CP0dll = (CP0dll_POINTER) getFunctionPointer(CP0dll_NAME);
CRITPdll = (CRITPdll_POINTER) getFunctionPointer(CRITPdll_NAME);
CSATKdll = (CSATKdll_POINTER) getFunctionPointer(CSATKdll_NAME);
CV2PKdll = (CV2PKdll_POINTER) getFunctionPointer(CV2PKdll_NAME);
CVCPKdll = (CVCPKdll_POINTER) getFunctionPointer(CVCPKdll_NAME);
CVCPdll = (CVCPdll_POINTER) getFunctionPointer(CVCPdll_NAME);
DBDTdll = (DBDTdll_POINTER) getFunctionPointer(DBDTdll_NAME);
DBFL1dll = (DBFL1dll_POINTER) getFunctionPointer(DBFL1dll_NAME);
DBFL2dll = (DBFL2dll_POINTER) getFunctionPointer(DBFL2dll_NAME);
DDDPdll = (DDDPdll_POINTER) getFunctionPointer(DDDPdll_NAME);
DDDTdll = (DDDTdll_POINTER) getFunctionPointer(DDDTdll_NAME);
DEFLSHdll = (DEFLSHdll_POINTER) getFunctionPointer(DEFLSHdll_NAME);
DHD1dll = (DHD1dll_POINTER) getFunctionPointer(DHD1dll_NAME);
DHFLSHdll = (DHFLSHdll_POINTER) getFunctionPointer(DHFLSHdll_NAME);
DIELECdll = (DIELECdll_POINTER) getFunctionPointer(DIELECdll_NAME);
DOTFILLdll = (DOTFILLdll_POINTER) getFunctionPointer(DOTFILLdll_NAME);
DPDD2dll = (DPDD2dll_POINTER) getFunctionPointer(DPDD2dll_NAME);
DPDDKdll = (DPDDKdll_POINTER) getFunctionPointer(DPDDKdll_NAME);
DPDDdll = (DPDDdll_POINTER) getFunctionPointer(DPDDdll_NAME);
DPDTKdll = (DPDTKdll_POINTER) getFunctionPointer(DPDTKdll_NAME);
DPDTdll = (DPDTdll_POINTER) getFunctionPointer(DPDTdll_NAME);
DPTSATKdll = (DPTSATKdll_POINTER) getFunctionPointer(DPTSATKdll_NAME);
DSFLSHdll = (DSFLSHdll_POINTER) getFunctionPointer(DSFLSHdll_NAME);
ENTHALdll = (ENTHALdll_POINTER) getFunctionPointer(ENTHALdll_NAME);
ENTROdll = (ENTROdll_POINTER) getFunctionPointer(ENTROdll_NAME);
ESFLSHdll = (ESFLSHdll_POINTER) getFunctionPointer(ESFLSHdll_NAME);
FGCTYdll = (FGCTYdll_POINTER) getFunctionPointer(FGCTYdll_NAME);
FPVdll = (FPVdll_POINTER) getFunctionPointer(FPVdll_NAME);
FUGCOFdll = (FUGCOFdll_POINTER) getFunctionPointer(FUGCOFdll_NAME);
GERG04dll = (GERG04dll_POINTER) getFunctionPointer(GERG04dll_NAME);
GETFIJdll = (GETFIJdll_POINTER) getFunctionPointer(GETFIJdll_NAME);
GETKTVdll = (GETKTVdll_POINTER) getFunctionPointer(GETKTVdll_NAME);
GIBBSdll = (GIBBSdll_POINTER) getFunctionPointer(GIBBSdll_NAME);
HSFLSHdll = (HSFLSHdll_POINTER) getFunctionPointer(HSFLSHdll_NAME);
INFOdll = (INFOdll_POINTER) getFunctionPointer(INFOdll_NAME);
LIMITKdll = (LIMITKdll_POINTER) getFunctionPointer(LIMITKdll_NAME);
LIMITSdll = (LIMITSdll_POINTER) getFunctionPointer(LIMITSdll_NAME);
LIMITXdll = (LIMITXdll_POINTER) getFunctionPointer(LIMITXdll_NAME);
MELTPdll = (MELTPdll_POINTER) getFunctionPointer(MELTPdll_NAME);
MELTTdll = (MELTTdll_POINTER) getFunctionPointer(MELTTdll_NAME);
MLTH2Odll = (MLTH2Odll_POINTER) getFunctionPointer(MLTH2Odll_NAME);
NAMEdll = (NAMEdll_POINTER) getFunctionPointer(NAMEdll_NAME);
PDFL1dll = (PDFL1dll_POINTER) getFunctionPointer(PDFL1dll_NAME);
PDFLSHdll = (PDFLSHdll_POINTER) getFunctionPointer(PDFLSHdll_NAME);
PEFLSHdll = (PEFLSHdll_POINTER) getFunctionPointer(PEFLSHdll_NAME);
PHFL1dll = (PHFL1dll_POINTER) getFunctionPointer(PHFL1dll_NAME);
PHFLSHdll = (PHFLSHdll_POINTER) getFunctionPointer(PHFLSHdll_NAME);
PQFLSHdll = (PQFLSHdll_POINTER) getFunctionPointer(PQFLSHdll_NAME);
PREOSdll = (PREOSdll_POINTER) getFunctionPointer(PREOSdll_NAME);
PRESSdll = (PRESSdll_POINTER) getFunctionPointer(PRESSdll_NAME);
PSFL1dll = (PSFL1dll_POINTER) getFunctionPointer(PSFL1dll_NAME);
PSFLSHdll = (PSFLSHdll_POINTER) getFunctionPointer(PSFLSHdll_NAME);
PUREFLDdll = (PUREFLDdll_POINTER) getFunctionPointer(PUREFLDdll_NAME);
RESIDUALdll = (RESIDUALdll_POINTER) getFunctionPointer(RESIDUALdll_NAME);
QMASSdll = (QMASSdll_POINTER) getFunctionPointer(QMASSdll_NAME);
QMOLEdll = (QMOLEdll_POINTER) getFunctionPointer(QMOLEdll_NAME);
SATDdll = (SATDdll_POINTER) getFunctionPointer(SATDdll_NAME);
SATEdll = (SATEdll_POINTER) getFunctionPointer(SATEdll_NAME);
SATHdll = (SATHdll_POINTER) getFunctionPointer(SATHdll_NAME);
SATPdll = (SATPdll_POINTER) getFunctionPointer(SATPdll_NAME);
SATSdll = (SATSdll_POINTER) getFunctionPointer(SATSdll_NAME);
SATTdll = (SATTdll_POINTER) getFunctionPointer(SATTdll_NAME);
SATSPLNdll = (SATSPLNdll_POINTER) getFunctionPointer(SATSPLNdll_NAME);
SETAGAdll = (SETAGAdll_POINTER) getFunctionPointer(SETAGAdll_NAME);
SETKTVdll = (SETKTVdll_POINTER) getFunctionPointer(SETKTVdll_NAME);
SETMIXdll = (SETMIXdll_POINTER) getFunctionPointer(SETMIXdll_NAME);
SETMODdll = (SETMODdll_POINTER) getFunctionPointer(SETMODdll_NAME);
SETREFdll = (SETREFdll_POINTER) getFunctionPointer(SETREFdll_NAME);
SETUPdll = (SETUPdll_POINTER) getFunctionPointer(SETUPdll_NAME);
// SPECGRdll = (SPECGRdll_POINTER) getFunctionPointer(SPECGRdll_NAME); // not in library
SUBLPdll = (SUBLPdll_POINTER) getFunctionPointer(SUBLPdll_NAME);
SUBLTdll = (SUBLTdll_POINTER) getFunctionPointer(SUBLTdll_NAME);
SURFTdll = (SURFTdll_POINTER) getFunctionPointer(SURFTdll_NAME);
SURTENdll = (SURTENdll_POINTER) getFunctionPointer(SURTENdll_NAME);
TDFLSHdll = (TDFLSHdll_POINTER) getFunctionPointer(TDFLSHdll_NAME);
TEFLSHdll = (TEFLSHdll_POINTER) getFunctionPointer(TEFLSHdll_NAME);
THERM0dll = (THERM0dll_POINTER) getFunctionPointer(THERM0dll_NAME);
THERM2dll = (THERM2dll_POINTER) getFunctionPointer(THERM2dll_NAME);
THERM3dll = (THERM3dll_POINTER) getFunctionPointer(THERM3dll_NAME);
THERMdll = (THERMdll_POINTER) getFunctionPointer(THERMdll_NAME);
THFLSHdll = (THFLSHdll_POINTER) getFunctionPointer(THFLSHdll_NAME);
TPFLSHdll = (TPFLSHdll_POINTER) getFunctionPointer(TPFLSHdll_NAME);
TPRHOdll = (TPRHOdll_POINTER) getFunctionPointer(TPRHOdll_NAME);
TQFLSHdll = (TQFLSHdll_POINTER) getFunctionPointer(TQFLSHdll_NAME);
TRNPRPdll = (TRNPRPdll_POINTER) getFunctionPointer(TRNPRPdll_NAME);
TSFLSHdll = (TSFLSHdll_POINTER) getFunctionPointer(TSFLSHdll_NAME);
VIRBdll = (VIRBdll_POINTER) getFunctionPointer(VIRBdll_NAME);
VIRCdll = (VIRCdll_POINTER) getFunctionPointer(VIRCdll_NAME);
WMOLdll = (WMOLdll_POINTER) getFunctionPointer(WMOLdll_NAME);
XMASSdll = (XMASSdll_POINTER) getFunctionPointer(XMASSdll_NAME);
XMOLEdll = (XMOLEdll_POINTER) getFunctionPointer(XMOLEdll_NAME);
return COOLPROP_OK;
}