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 x4

Browse Source
This commit is contained in:
Milo Yip 2015-12-18 19:54:10 +08:00
parent 4cb7c88ca9
commit d6478991d0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/rapidjson/filereadstream.h
View File

@ -51,8 +51,8 @@ public:
size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); } size_t Tell() const { return count_ + static_cast<size_t>(current_ - buffer_); }
// Not implemented // Not implemented
void Put(Ch) RAPIDJSON_NORETURN_SUFFIX { RAPIDJSON_ASSERT(false); } void Put(Ch) { RAPIDJSON_ASSERT(false); }
void Flush() RAPIDJSON_NORETURN_SUFFIX { RAPIDJSON_ASSERT(false); } void Flush() { RAPIDJSON_ASSERT(false); }
Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; } Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; } size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }

4
test/unittest/readertest.cpp
View File

@ -1040,8 +1040,8 @@ public:
size_t Tell() const { return static_cast<size_t>(is_.tellg()); } size_t Tell() const { return static_cast<size_t>(is_.tellg()); }
Ch* PutBegin() { assert(false); return 0; } Ch* PutBegin() { assert(false); return 0; }
void Put(Ch) RAPIDJSON_NORETURN_SUFFIX { assert(false); } void Put(Ch) { assert(false); }
void Flush() RAPIDJSON_NORETURN_SUFFIX { assert(false); } void Flush() { assert(false); }
size_t PutEnd(Ch*) { assert(false); return 0; } size_t PutEnd(Ch*) { assert(false); return 0; }
private: private:

8
test/unittest/valuetest.cpp
View File

@ -482,12 +482,12 @@ TEST(Value, Int64) {
z.SetInt64(1234); z.SetInt64(1234);
EXPECT_EQ(1234, z.GetInt64()); EXPECT_EQ(1234, z.GetInt64());
z.SetInt64(2147483648); // 2^31, cannot cast as int z.SetInt64(2147483648u); // 2^31, cannot cast as int
EXPECT_FALSE(z.IsInt()); EXPECT_FALSE(z.IsInt());
EXPECT_TRUE(z.IsUint()); EXPECT_TRUE(z.IsUint());
EXPECT_NEAR(2147483648.0, z.GetDouble(), 0.0); EXPECT_NEAR(2147483648.0, z.GetDouble(), 0.0);
z.SetInt64(4294967296); // 2^32, cannot cast as uint z.SetInt64(int64_t(4294967298u) + 1); // 2^32, cannot cast as uint
EXPECT_FALSE(z.IsInt()); EXPECT_FALSE(z.IsInt());
EXPECT_FALSE(z.IsUint()); EXPECT_FALSE(z.IsUint());
EXPECT_NEAR(4294967296.0, z.GetDouble(), 0.0); EXPECT_NEAR(4294967296.0, z.GetDouble(), 0.0);
@ -528,12 +528,12 @@ TEST(Value, Uint64) {
z.SetUint64(1234); z.SetUint64(1234);
EXPECT_EQ(1234u, z.GetUint64()); EXPECT_EQ(1234u, z.GetUint64());
z.SetUint64(uint64_t(2147483648)); // 2^31, cannot cast as int z.SetUint64(uint64_t(2147483648u)); // 2^31, cannot cast as int
EXPECT_FALSE(z.IsInt()); EXPECT_FALSE(z.IsInt());
EXPECT_TRUE(z.IsUint()); EXPECT_TRUE(z.IsUint());
EXPECT_TRUE(z.IsInt64()); EXPECT_TRUE(z.IsInt64());
z.SetUint64(uint64_t(4294967295) + 1); // 2^32, cannot cast as uint z.SetUint64(uint64_t(4294967295u) + 1); // 2^32, cannot cast as uint
EXPECT_FALSE(z.IsInt()); EXPECT_FALSE(z.IsInt());
EXPECT_FALSE(z.IsUint()); EXPECT_FALSE(z.IsUint());
EXPECT_TRUE(z.IsInt64()); EXPECT_TRUE(z.IsInt64());