Skip to content

Commit b7030fc

Browse files
committed
Fix compiler error (VS2010) and warning
1 parent d93cf96 commit b7030fc

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

lib/checkfunctions.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,4 +285,4 @@ void CheckFunctions::checkLibraryMatchFunctions()
285285
"--check-library: There is no matching configuration for function " + tok->str() + "()");
286286
}
287287
}
288-
}
288+
}

test/testmathlib.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,12 +271,14 @@ class TestMathLib : public TestFixture {
271271

272272
// from char
273273
ASSERT_EQUALS((int)('A'), MathLib::toLongNumber("'A'"));
274+
#ifdef __GNUC__
274275
// BEGIN Implementation-specific results
275276
ASSERT_EQUALS((int)('AB'), MathLib::toLongNumber("'AB'"));
276277
ASSERT_EQUALS((int)('ABC'), MathLib::toLongNumber("'ABC'"));
277278
ASSERT_EQUALS((int)('ABCD'), MathLib::toLongNumber("'ABCD'"));
278279
ASSERT_EQUALS((int)('ABCDE'), MathLib::toLongNumber("'ABCDE'"));
279280
// END Implementation-specific results
281+
#endif
280282
ASSERT_EQUALS((int)('\0'), MathLib::toLongNumber("'\\0'"));
281283
ASSERT_EQUALS((int)('\r'), MathLib::toLongNumber("'\\r'"));
282284
ASSERT_EQUALS((int)('\x12'), MathLib::toLongNumber("'\\x12'"));
@@ -313,10 +315,10 @@ class TestMathLib : public TestFixture {
313315

314316
// from long long
315317
/*
316-
* ASSERT_EQUALS(0xFF00000000000000LL, MathLib::toLongNumber("0xFF00000000000000LL"));
318+
* ASSERT_EQUALS(0xFF00000000000000LL, MathLib::toLongNumber("0xFF00000000000000LL"));
317319
* This does not work in a portable way!
318320
* While it succeeds on 32bit Visual Studio it fails on Linux 64bit because it is greater than 0x7FFFFFFFFFFFFFFF (=LLONG_MAX)
319-
*/
321+
*/
320322

321323
ASSERT_EQUALS(0x0A00000000000000LL, MathLib::toLongNumber("0x0A00000000000000LL"));
322324
}

0 commit comments

Comments
 (0)