no longer need to pass the size to rapidjson

1 files changed, 25 insertions, 23 deletions

diff --git a/external/rapidjson/prettywriter.h b/external/rapidjson/prettywriter.h
index 4eac8d76f..adfff4fd5 100644
--- a/external/rapidjson/prettywriter.h
+++ b/external/rapidjson/prettywriter.h
@@ -1,22 +1,16 @@
-// Copyright (C) 2011 Milo Yip

+// Tencent is pleased to support the open source community by making RapidJSON available.

+// 

+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.

 //

-// Permission is hereby granted, free of charge, to any person obtaining a copy

-// of this software and associated documentation files (the "Software"), to deal

-// in the Software without restriction, including without limitation the rights

-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell

-// copies of the Software, and to permit persons to whom the Software is

-// furnished to do so, subject to the following conditions:

+// Licensed under the MIT License (the "License"); you may not use this file except

+// in compliance with the License. You may obtain a copy of the License at

 //

-// The above copyright notice and this permission notice shall be included in

-// all copies or substantial portions of the Software.

+// http://opensource.org/licenses/MIT

 //

-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN

-// THE SOFTWARE.

+// Unless required by applicable law or agreed to in writing, software distributed 

+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 

+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 

+// specific language governing permissions and limitations under the License.

 

 #ifndef RAPIDJSON_PRETTYWRITER_H_

 #define RAPIDJSON_PRETTYWRITER_H_

@@ -28,7 +22,7 @@ RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)

 #endif

 

-namespace rapidjson {

+RAPIDJSON_NAMESPACE_BEGIN

 

 //! Writer with indentation and spacing.

 /*!

@@ -82,6 +76,12 @@ public:
         return Base::WriteString(str, length);

     }

 

+#if RAPIDJSON_HAS_STDSTRING

+    bool String(const std::basic_string<Ch>& str) {

+        return String(str.data(), SizeType(str.size()));

+    }

+#endif

+

     bool StartObject() {

         PrettyPrefix(kObjectType);

         new (Base::level_stack_.template Push<typename Base::Level>()) typename Base::Level(false);

@@ -100,8 +100,9 @@ public:
             Base::os_->Put('\n');

             WriteIndent();

         }

-        if (!Base::WriteEndObject())

-            return false;

+        bool ret = Base::WriteEndObject();

+        (void)ret;

+        RAPIDJSON_ASSERT(ret == true);

         if (Base::level_stack_.Empty()) // end of json text

             Base::os_->Flush();

         return true;

@@ -123,8 +124,9 @@ public:
             Base::os_->Put('\n');

             WriteIndent();

         }

-        if (!Base::WriteEndArray())

-            return false;

+        bool ret = Base::WriteEndArray();

+        (void)ret;

+        RAPIDJSON_ASSERT(ret == true);

         if (Base::level_stack_.Empty()) // end of json text

             Base::os_->Flush();

         return true;

@@ -184,7 +186,7 @@ protected:
 

     void WriteIndent()  {

         size_t count = (Base::level_stack_.GetSize() / sizeof(typename Base::Level)) * indentCharCount_;

-        PutN(*Base::os_, indentChar_, count);

+        PutN(*Base::os_, static_cast<typename TargetEncoding::Ch>(indentChar_), count);

     }

 

     Ch indentChar_;

@@ -196,7 +198,7 @@ private:
     PrettyWriter& operator=(const PrettyWriter&);

 };

 

-} // namespace rapidjson

+RAPIDJSON_NAMESPACE_END

 

 #ifdef __GNUC__

 RAPIDJSON_DIAG_POP