summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/rapidjson/test/unittest/valuetest.cpp
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-27 18:00:54 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-27 18:00:54 +0200
commit7b9f4e41b93dac0ddca9dd449da79b0416a27d14 (patch)
treed807ae5a46f065017e36a8e7309991a85c3af584 /3rdparty/rapidjson/test/unittest/valuetest.cpp
parent94c7dd996bfb9123425c87f2d149018d371dded7 (diff)
Updated rapidjson (nw)
Diffstat (limited to '3rdparty/rapidjson/test/unittest/valuetest.cpp')
-rw-r--r--3rdparty/rapidjson/test/unittest/valuetest.cpp14
1 files changed, 9 insertions, 5 deletions
diff --git a/3rdparty/rapidjson/test/unittest/valuetest.cpp b/3rdparty/rapidjson/test/unittest/valuetest.cpp
index d6c7492deae..feec049d09d 100644
--- a/3rdparty/rapidjson/test/unittest/valuetest.cpp
+++ b/3rdparty/rapidjson/test/unittest/valuetest.cpp
@@ -94,23 +94,23 @@ TEST(Value, Traits) {
#endif
TEST(Value, MoveConstructor) {
- typedef GenericValue<UTF8<>, CrtAllocator> Value;
- Value::AllocatorType allocator;
+ typedef GenericValue<UTF8<>, CrtAllocator> V;
+ V::AllocatorType allocator;
- Value x((Value(kArrayType)));
+ V x((V(kArrayType)));
x.Reserve(4u, allocator);
x.PushBack(1, allocator).PushBack(2, allocator).PushBack(3, allocator).PushBack(4, allocator);
EXPECT_TRUE(x.IsArray());
EXPECT_EQ(4u, x.Size());
// Value y(x); // does not compile (!is_copy_constructible)
- Value y(std::move(x));
+ V y(std::move(x));
EXPECT_TRUE(x.IsNull());
EXPECT_TRUE(y.IsArray());
EXPECT_EQ(4u, y.Size());
// Value z = y; // does not compile (!is_copy_assignable)
- Value z = std::move(y);
+ V z = std::move(y);
EXPECT_TRUE(y.IsNull());
EXPECT_TRUE(z.IsArray());
EXPECT_EQ(4u, z.Size());
@@ -402,6 +402,7 @@ TEST(Value, Int) {
EXPECT_TRUE(x.IsUint64());
EXPECT_FALSE(x.IsDouble());
+ EXPECT_FALSE(x.IsFloat());
EXPECT_FALSE(x.IsNull());
EXPECT_FALSE(x.IsBool());
EXPECT_FALSE(x.IsFalse());
@@ -456,6 +457,7 @@ TEST(Value, Uint) {
EXPECT_NEAR(1234.0, x.GetDouble(), 0.0); // Number can always be cast as double but !IsDouble().
EXPECT_FALSE(x.IsDouble());
+ EXPECT_FALSE(x.IsFloat());
EXPECT_FALSE(x.IsNull());
EXPECT_FALSE(x.IsBool());
EXPECT_FALSE(x.IsFalse());
@@ -500,6 +502,7 @@ TEST(Value, Int64) {
EXPECT_TRUE(x.IsUint64());
EXPECT_FALSE(x.IsDouble());
+ EXPECT_FALSE(x.IsFloat());
EXPECT_FALSE(x.IsNull());
EXPECT_FALSE(x.IsBool());
EXPECT_FALSE(x.IsFalse());
@@ -561,6 +564,7 @@ TEST(Value, Uint64) {
EXPECT_TRUE(x.IsUint64());
EXPECT_FALSE(x.IsDouble());
+ EXPECT_FALSE(x.IsFloat());
EXPECT_FALSE(x.IsNull());
EXPECT_FALSE(x.IsBool());
EXPECT_FALSE(x.IsFalse());