Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-02-05 12:30:26 +01:00
commit ed78c7153c
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/nel/tools/nel_unit_test/ut_misc_string_common.h
View file

@ -444,11 +444,13 @@ struct CUTMiscStringCommon : public Test::Suite
// min limit -1, unable to compare with minimum value because no lower type // min limit -1, unable to compare with minimum value because no lower type
ret = NLMISC::fromString("-9223372036854775809", val); ret = NLMISC::fromString("-9223372036854775809", val);
TEST_ASSERT(ret && val == std::numeric_limits<sint64>::max()); // with GCC, it returns min, with VC++ it returns max
TEST_ASSERT(ret && (val == std::numeric_limits<sint64>::max() || std::numeric_limits<sint64>::min()));
// max limit +1, unable to compare with maximum value because no higher type // max limit +1, unable to compare with maximum value because no higher type
ret = NLMISC::fromString("9223372036854775808", val); ret = NLMISC::fromString("9223372036854775808", val);
TEST_ASSERT(ret && val == std::numeric_limits<sint64>::min()); // with GCC, it returns max with VC++ it returns min
TEST_ASSERT(ret && (val == std::numeric_limits<sint64>::min() || std::numeric_limits<sint64>::max()));
// with period // with period
ret = NLMISC::fromString("1.2", val); ret = NLMISC::fromString("1.2", val);
@ -508,7 +510,8 @@ struct CUTMiscStringCommon : public Test::Suite
// max limit +1, unable to compare with maximum value because no higher type // max limit +1, unable to compare with maximum value because no higher type
ret = NLMISC::fromString("18446744073709551616", val); ret = NLMISC::fromString("18446744073709551616", val);
TEST_ASSERT(ret && val == std::numeric_limits<uint64>::min()); // with GCC, it returns max with VC++ it returns min
TEST_ASSERT(ret && (val == std::numeric_limits<uint64>::min() || val == std::numeric_limits<uint64>::max()));
// with period // with period
ret = NLMISC::fromString("1.2", val); ret = NLMISC::fromString("1.2", val);