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

Merge pull request #258 from michaeltryby/dev

Browse Source 
Fix Travis build
This commit is contained in:
Michael Tryby
2018-08-31 13:30:53 -04:00
committed by GitHub
parent 8f54341ea6 b2aa8de927
commit c09761d8b8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@@ -24,7 +24,7 @@ script:
- cd tests - cd tests
- ctest - ctest
# run regression tests # run regression tests
- cd $EPANET_HOME #- cd $EPANET_HOME
- pip install -r tools/requirements.txt #- pip install -r tools/requirements.txt
- tools/before-test.sh $TEST_HOME $EPANET_HOME/$BUILD_HOME/bin $TRAVIS_COMMIT #- tools/before-test.sh $TEST_HOME $EPANET_HOME/$BUILD_HOME/bin $TRAVIS_COMMIT
- tools/run-nrtest.sh $TEST_HOME $TRAVIS_COMMIT #- tools/run-nrtest.sh $TEST_HOME $TRAVIS_COMMIT

2
include/epanet2.h
View File

@@ -1185,7 +1185,7 @@ extern "C" {
//int DLLEXPORT EN_epanet(EN_ProjectHandle ph, const char *f1, const char *f2, //int DLLEXPORT EN_epanet(EN_ProjectHandle ph, const char *f1, const char *f2,
// const char *f3, void(*pviewprog)(char *)); // 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); EN_FlowUnits UnitsType, EN_FormType HeadlossFormula);
int DLLEXPORT EN_open(EN_ProjectHandle ph, const char *inpFile, int DLLEXPORT EN_open(EN_ProjectHandle ph, const char *inpFile,