From 284dcf3dc52d91970466e296eddd3ac995a1fefb Mon Sep 17 00:00:00 2001 From: Milo Yip Date: Thu, 28 Aug 2014 20:25:41 +0800 Subject: [PATCH] Change MemberEmpty() to ObjectEmpty() --- include/rapidjson/document.h | 2 +- test/unittest/valuetest.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h index 6421311..614f391 100644 --- a/include/rapidjson/document.h +++ b/include/rapidjson/document.h @@ -748,7 +748,7 @@ public: SizeType MemberCount() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size; } //! Check whether the object is empty. - bool MemberEmpty() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; } + bool ObjectEmpty() const { RAPIDJSON_ASSERT(IsObject()); return data_.o.size == 0; } //! Get the value associated with the name. /*! diff --git a/test/unittest/valuetest.cpp b/test/unittest/valuetest.cpp index e22b696..a234e1f 100644 --- a/test/unittest/valuetest.cpp +++ b/test/unittest/valuetest.cpp @@ -763,16 +763,16 @@ TEST(Value, Object) { EXPECT_EQ(kObjectType, x.GetType()); EXPECT_TRUE(x.IsObject()); - EXPECT_TRUE(x.MemberEmpty()); + EXPECT_TRUE(x.ObjectEmpty()); EXPECT_EQ(0u, x.MemberCount()); EXPECT_EQ(kObjectType, y.GetType()); EXPECT_TRUE(y.IsObject()); - EXPECT_TRUE(y.MemberEmpty()); + EXPECT_TRUE(y.ObjectEmpty()); EXPECT_EQ(0u, y.MemberCount()); // AddMember() x.AddMember("A", "Apple", allocator); - EXPECT_FALSE(x.MemberEmpty()); + EXPECT_FALSE(x.ObjectEmpty()); EXPECT_EQ(1u, x.MemberCount()); Value value("Banana", 6); @@ -965,7 +965,7 @@ TEST(Value, Object) { // RemoveAllMembers() x.RemoveAllMembers(); - EXPECT_TRUE(x.MemberEmpty()); + EXPECT_TRUE(x.ObjectEmpty()); EXPECT_EQ(0u, x.MemberCount()); // SetObject()