From b92d0ebd1b8b96c11a50d88215a6ccd38013ee6f Mon Sep 17 00:00:00 2001 From: Kosta Date: Mon, 1 Sep 2014 11:15:52 +0200 Subject: [PATCH] code cleanup for `StringEqual()` Instead of replicating the functionality of `GetString()` and `GetStringLength()` in `StringEqual()` it now calls these methods instead. --- include/rapidjson/document.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h index edab98d..20e4f4c 100644 --- a/include/rapidjson/document.h +++ b/include/rapidjson/document.h @@ -1498,12 +1498,12 @@ private: RAPIDJSON_ASSERT(IsString()); RAPIDJSON_ASSERT(rhs.IsString()); - const SizeType len1 = (flags_ == kShortStringFlag) ? data_.ss.length : data_.s.length; - const SizeType len2 = (rhs.flags_ == kShortStringFlag) ? rhs.data_.ss.length : rhs.data_.s.length; + const SizeType len1 = GetStringLength(); + const SizeType len2 = rhs.GetStringLength(); if(len1 != len2) { return false; } - const Ch* const str1 = (flags_ == kShortStringFlag) ? data_.ss.str : data_.s.str; - const Ch* const str2 = (rhs.flags_ == kShortStringFlag) ? rhs.data_.ss.str : rhs.data_.s.str; + const Ch* const str1 = GetString(); + const Ch* const str2 = rhs.GetString(); if(str1 == str2) { return true; } // fast path for constant string return (memcmp(str1, str2, sizeof(Ch) * len1) == 0);