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

Fixing build warnings on gcc

Browse Source
This commit is contained in:
Michael Tryby
2019-04-16 17:40:40 -04:00
parent 3186ec326c
commit f161ecaa72
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test_curve.cpp
View File

@@ -71,20 +71,20 @@ BOOST_FIXTURE_TEST_CASE(test_curve_id_isvalid, FixtureInitClose)
{ {
int index; int index;
error = EN_addcurve(ph, "C1"); error = EN_addcurve(ph, (char *)"C1");
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_addcurve(ph, "C 2"); error = EN_addcurve(ph, (char *)"C 2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
error = EN_addcurve(ph, "C\"2"); error = EN_addcurve(ph, (char *)"C\"2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
error = EN_addcurve(ph, "C;2"); error = EN_addcurve(ph, (char *)"C;2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
EN_getcurveindex(ph, "C1", &index); EN_getcurveindex(ph, (char *)"C1", &index);
error = EN_setcurveid(ph, index, "C;2"); error = EN_setcurveid(ph, index, (char *)"C;2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
} }

4
tests/test_link.cpp
View File

@@ -76,8 +76,8 @@ BOOST_FIXTURE_TEST_CASE(test_link_id_isvalid, FixtureInitClose)
error = EN_addlink(ph, (char *)"L;2", EN_PIPE, (char *)"N1", (char *)"N2"); error = EN_addlink(ph, (char *)"L;2", EN_PIPE, (char *)"N1", (char *)"N2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
EN_getlinkindex(ph, "L1", &index); EN_getlinkindex(ph, (char *)"L1", &index);
error = EN_setlinkid(ph, index, "L;1"); error = EN_setlinkid(ph, index, (char *)"L;1");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
} }

4
tests/test_node.cpp
View File

@@ -63,8 +63,8 @@ BOOST_FIXTURE_TEST_CASE(test_node_validate_id, FixtureInitClose)
error = EN_addnode(ph, (char *)"N;3", EN_JUNCTION); error = EN_addnode(ph, (char *)"N;3", EN_JUNCTION);
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
EN_getnodeindex(ph, "N2", &index); EN_getnodeindex(ph, (char *)"N2", &index);
error = EN_setnodeid(ph, index, "N;2"); error = EN_setnodeid(ph, index, (char *)"N;2");
BOOST_REQUIRE(error = 250); BOOST_REQUIRE(error = 250);
} }

12
tests/test_pattern.cpp
View File

@@ -151,20 +151,20 @@ BOOST_FIXTURE_TEST_CASE(test_pat_id_isvalid, FixtureInitClose)
{ {
int index; int index;
error = EN_addpattern(ph, "P1"); error = EN_addpattern(ph, (char *)"P1");
BOOST_REQUIRE(error == 0); BOOST_REQUIRE(error == 0);
error = EN_addpattern(ph, "P 2"); error = EN_addpattern(ph, (char *)"P 2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
error = EN_addpattern(ph, "P\"2"); error = EN_addpattern(ph, (char *)"P\"2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
error = EN_addpattern(ph, "P;2"); error = EN_addpattern(ph, (char *)"P;2");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
EN_getpatternindex(ph, "P1", &index); EN_getpatternindex(ph, (char *)"P1", &index);
error = EN_setpatternid(ph, index, "P;1"); error = EN_setpatternid(ph, index, (char *)"P;1");
BOOST_REQUIRE(error == 250); BOOST_REQUIRE(error == 250);
} }