epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Fix errors from MS compiler, which overloads pow() in C++.

Browse Source
This commit is contained in:
Andrew Johnson
2006-10-02 18:01:44 +00:00
parent 7001736104
commit eeac94ca3b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libCom/test/epicsCalcTest.cpp
View File

@@ -64,7 +64,7 @@ void testCalc(const char *expr, double expected) {
if (finite(expected) && finite(result)) {
pass = fabs(expected - result) < 1e-8;
} else if (isnan(expected)) {
pass = isnan(result);
pass = (bool) isnan(result);
} else {
pass = (result == expected);
}
@@ -398,8 +398,8 @@ MAIN(epicsCalcTest) (int /*argc*/, char* /*argv[]*/)
testCalc("-2 ^ 2", pow(-2., 2.)); // 7 6
// Check parentheses
testCalc("(1 | 2) ** 3", pow(1 | 2, 3.)); // 8 6
testCalc("1+(1|2)**3", 1+pow(1 | 2, 3.)); // 8 6
testCalc("(1 | 2) ** 3", pow((double) (1 | 2), 3.));// 8 6
testCalc("1+(1|2)**3", 1+pow((double) (1 | 2), 3.));// 8 6
testExpr(1+(1?(1<2):(1>2))*2);
return testDone();