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

Try to fix clang and gcc warnings problems again x7

Browse Source
This commit is contained in:
Milo Yip 2015-12-18 20:15:11 +08:00
parent d72039f3ef
commit 6d6381f596
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rapidjson/document.h
View File

@ -1231,7 +1231,7 @@ public:
for (MemberIterator itr = pos; itr != last; ++itr) for (MemberIterator itr = pos; itr != last; ++itr)
itr->~Member(); itr->~Member();
std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member)); std::memmove(&*pos, &*last, static_cast<size_t>(MemberEnd() - last) * sizeof(Member));
data_.o.size -= (last - first); data_.o.size -= static_cast<SizeType>(last - first);
return pos; return pos;
} }
@ -1431,7 +1431,7 @@ public:
for (ValueIterator itr = pos; itr != last; ++itr) for (ValueIterator itr = pos; itr != last; ++itr)
itr->~GenericValue(); itr->~GenericValue();
std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue)); std::memmove(pos, last, static_cast<size_t>(End() - last) * sizeof(GenericValue));
data_.a.size -= (last - first); data_.a.size -= static_cast<SizeType>(last - first);
return pos; return pos;
} }

2
include/rapidjson/rapidjson.h
View File

@ -467,7 +467,7 @@ RAPIDJSON_NAMESPACE_END
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// RAPIDJSON_NORETURN_SUFFIX // RAPIDJSON_NORETURN_SUFFIX
#if defined(__clang__) #if defined(__clang__) && !defined(NDEBUG)
#define RAPIDJSON_NORETURN_SUFFIX __attribute__ ((noreturn)) #define RAPIDJSON_NORETURN_SUFFIX __attribute__ ((noreturn))
#else #else
#define RAPIDJSON_NORETURN_SUFFIX #define RAPIDJSON_NORETURN_SUFFIX

2
test/unittest/valuetest.cpp
View File

@ -492,7 +492,7 @@ TEST(Value, Int64) {
EXPECT_FALSE(z.IsUint()); EXPECT_FALSE(z.IsUint());
EXPECT_NEAR(4294967296.0, z.GetDouble(), 0.0); EXPECT_NEAR(4294967296.0, z.GetDouble(), 0.0);
z.SetInt64(int64_t(-2147483648) - 1); // -2^31-1, cannot cast as int z.SetInt64(-int64_t(2147483648u) - 1); // -2^31-1, cannot cast as int
EXPECT_FALSE(z.IsInt()); EXPECT_FALSE(z.IsInt());
EXPECT_NEAR(-2147483649.0, z.GetDouble(), 0.0); EXPECT_NEAR(-2147483649.0, z.GetDouble(), 0.0);