From c4b6756926c421f87c58e9020388dc39c7137c09 Mon Sep 17 00:00:00 2001 From: Michael Tryby Date: Thu, 30 Aug 2018 15:39:06 -0400 Subject: [PATCH] Fixing compile error on Travis --- include/epanet2.h | 4 ++-- src/epanet.c | 45 ++++++++++++++++++++++----------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/include/epanet2.h b/include/epanet2.h index 1333acd..9d2fcb5 100644 --- a/include/epanet2.h +++ b/include/epanet2.h @@ -1176,8 +1176,8 @@ extern "C" { int DLLEXPORT EN_runproject(EN_ProjectHandle ph, const char *f1, const char *f2, const char *f3, void(*pviewprog)(char *)); - - int DLLEXPORT EN_init(EN_ProjectHandle *ph, char *rptFile, char *binOutFile, + + int DLLEXPORT EN_init(EN_ProjectHandle ph, char *rptFile, char *binOutFile, EN_FlowUnits UnitsType, EN_FormType HeadlossFormula); int DLLEXPORT EN_open(EN_ProjectHandle ph, const char *inpFile, diff --git a/src/epanet.c b/src/epanet.c index a7fd843..58b8477 100644 --- a/src/epanet.c +++ b/src/epanet.c @@ -185,29 +185,6 @@ int DLLEXPORT ENepanet(const char *f1, const char *f2, const char *f3, void (*pv return (errcode); } -int DLLEXPORT EN_runproject(EN_ProjectHandle ph, const char *f1, const char *f2, - const char *f3, void (*pviewprog)(char *)) -{ - int errcode = 0; - EN_Project *p = NULL; - - ERRCODE(EN_open(ph, f1, f2, f3)); - - p = (EN_Project*)(ph); - p->viewprog = pviewprog; - - if (p->out_files.Hydflag != USE) { - ERRCODE(EN_solveH(ph)); - } - - ERRCODE(EN_solveQ(ph)); - ERRCODE(EN_report(ph)); - - EN_close(ph); - - return errcode; -} - int DLLEXPORT ENinit(char *f2, char *f3, int UnitsType, int HeadlossFormula) { int errcode = 0; @@ -632,6 +609,28 @@ int DLLEXPORT EN_deleteproject(EN_ProjectHandle *ph) return 0; } +int DLLEXPORT EN_runproject(EN_ProjectHandle ph, const char *f1, const char *f2, + const char *f3, void (*pviewprog)(char *)) +{ + int errcode = 0; + EN_Project *p = NULL; + + ERRCODE(EN_open(ph, f1, f2, f3)); + + p = (EN_Project*)(ph); + p->viewprog = pviewprog; + + if (p->out_files.Hydflag != USE) { + ERRCODE(EN_solveH(ph)); + } + + ERRCODE(EN_solveQ(ph)); + ERRCODE(EN_report(ph)); + + EN_close(ph); + + return errcode; +} int DLLEXPORT EN_init(EN_ProjectHandle ph, char *f2, char *f3, EN_FlowUnits UnitsType, EN_FormType HeadlossFormula)