JIANG/EPANET
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing build error gcc / Travis

Browse Source
This commit is contained in:
Michael Tryby
2019-01-30 14:30:44 -05:00
parent d62d606b30
commit cba9dda5cf
3 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/epanet_py.h
View File

@@ -67,8 +67,8 @@ int DLLEXPORT rprt_getcount(Handle ph, EN_CountType code, int *count);
int DLLEXPORT rprt_anlysstats(Handle ph, EN_AnalysisStatistic code, double* value);
int DLLEXPORT anlys_getoption(Handle ph, EN_Option opt, double *value);
int DLLEXPORT anlys_setoption(Handle ph, int code, double value);
int DLLEXPORT anlys_getoption(Handle ph, EN_Option code, double *value);
int DLLEXPORT anlys_setoption(Handle ph, EN_Option code, double value);
int DLLEXPORT anlys_getflowunits(Handle ph, int *code);
int DLLEXPORT anlys_setflowunits(Handle ph, EN_FlowUnits code);
int DLLEXPORT anlys_gettimeparam(Handle ph, EN_TimeParameter code, long *value);
@@ -84,8 +84,8 @@ int DLLEXPORT node_getindex(Handle ph, char *id, int *index);
int DLLEXPORT node_getid(Handle ph, int index, char *id);
int DLLEXPORT node_setid(Handle ph, int index, char *newid);
int DLLEXPORT node_gettype(Handle ph, int index, int *code);
int DLLEXPORT node_getvalue(Handle ph, int index, int code, double *value);
int DLLEXPORT node_setvalue(Handle ph, int index, int code, double value);
int DLLEXPORT node_getvalue(Handle ph, int index, EN_NodeProperty code, double *value);
int DLLEXPORT node_setvalue(Handle ph, int index, EN_NodeProperty code, double value);
int DLLEXPORT node_getcoord(Handle ph, int index, double *x, double *y);
int DLLEXPORT node_setcoord(Handle ph, int index, double x, double y);

8
src/epanet_py.c
View File

@@ -249,13 +249,13 @@ int DLLEXPORT rprt_anlysstats(Handle ph, EN_AnalysisStatistic code, double* valu
int DLLEXPORT anlys_getoption(Handle ph, EN_Option code, double *value)
{
handle_t *pr = (handle_t *)ph;
return error_set(pr->error, EN_getoption(pr->project, code, value));
return error_set(pr->error, EN_getoption(pr->project, (int)code, value));
}
int DLLEXPORT anlys_setoption(Handle ph, EN_Option code, double value)
{
handle_t *pr = (handle_t *)ph;
return error_set(pr->error, EN_setoption(pr->project, code, value));
return error_set(pr->error, EN_setoption(pr->project, (int)code, value));
}
int DLLEXPORT anlys_getflowunits(Handle ph, int *code)
@@ -342,13 +342,13 @@ int DLLEXPORT node_gettype(Handle ph, int index, int *code)
int DLLEXPORT node_getvalue(Handle ph, int index, EN_NodeProperty code, double *value)
{
handle_t *pr = (handle_t *)ph;
return error_set(pr->error, EN_getnodevalue(pr->project, index, code, value));
return error_set(pr->error, EN_getnodevalue(pr->project, index, (int)code, value));
}
int DLLEXPORT node_setvalue(Handle ph, int index, EN_NodeProperty code, double value)
{
handle_t *pr = (handle_t *)ph;
return error_set(pr->error, EN_setnodevalue(pr->project, index, code, value));
return error_set(pr->error, EN_setnodevalue(pr->project, index, (int)code, value));
}
int DLLEXPORT node_getcoord(Handle ph, int index, double *x, double *y)