gvsafronov/rapidjson
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1302 from chwarr/min-max-guard

Browse Source 
Guard against min/max being macros in reader.h
This commit is contained in:
Milo Yip 2018-09-10 11:22:28 +08:00 committed by GitHub
commit 08b1a8a41e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/unittest/itoatest.cpp
View File

@ -79,12 +79,12 @@ static void Verify(void(*f)(T, char*), char* (*g)(T, char*)) {
do { do {
VerifyValue<T>(i - 1, f, g); VerifyValue<T>(i - 1, f, g);
VerifyValue<T>(i, f, g); VerifyValue<T>(i, f, g);
if (std::numeric_limits<T>::min() < 0) { if ((std::numeric_limits<T>::min)() < 0) {
VerifyValue<T>(Traits<T>::Negate(i), f, g); VerifyValue<T>(Traits<T>::Negate(i), f, g);
VerifyValue<T>(Traits<T>::Negate(i + 1), f, g); VerifyValue<T>(Traits<T>::Negate(i + 1), f, g);
} }
last = i; last = i;
if (i > static_cast<T>(std::numeric_limits<T>::max() / static_cast<T>(power))) if (i > static_cast<T>((std::numeric_limits<T>::max)() / static_cast<T>(power)))
break; break;
i *= static_cast<T>(power); i *= static_cast<T>(power);
} while (last < i); } while (last < i);

2
test/unittest/readertest.cpp
View File

@ -422,7 +422,7 @@ static void TestParseDouble() {
"67546703537516986049910576551282076245490090389328944075868508455133942" "67546703537516986049910576551282076245490090389328944075868508455133942"
"30458323690322294816580855933212334827479782620414472316873817718091929" "30458323690322294816580855933212334827479782620414472316873817718091929"
"9881250404026184124858368", "9881250404026184124858368",
std::numeric_limits<double>::max()); (std::numeric_limits<double>::max)());
TEST_DOUBLE(fullPrecision, TEST_DOUBLE(fullPrecision,
"243546080556034731077856379609316893158278902575447060151047" "243546080556034731077856379609316893158278902575447060151047"