no longer need to pass the size to rapidjson

1 files changed, 25 insertions, 20 deletions

diff --git a/external/rapidjson/filereadstream.h b/external/rapidjson/filereadstream.h
index 31c193bf9..6c8a86c8e 100644
--- a/external/rapidjson/filereadstream.h
+++ b/external/rapidjson/filereadstream.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_FILEREADSTREAM_H_

 #define RAPIDJSON_FILEREADSTREAM_H_

@@ -24,7 +18,14 @@
 #include "rapidjson.h"

 #include <cstdio>

 

-namespace rapidjson {

+#ifdef __clang__

+RAPIDJSON_DIAG_PUSH

+RAPIDJSON_DIAG_OFF(padded)

+RAPIDJSON_DIAG_OFF(unreachable-code)

+RAPIDJSON_DIAG_OFF(missing-noreturn)

+#endif

+

+RAPIDJSON_NAMESPACE_BEGIN

 

 //! File byte stream for input using fread().

 /*!

@@ -40,7 +41,7 @@ public:
         \param buffer user-supplied buffer.

         \param bufferSize size of buffer in bytes. Must >=4 bytes.

     */

-    FileReadStream(FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 

+    FileReadStream(std::FILE* fp, char* buffer, size_t bufferSize) : fp_(fp), buffer_(buffer), bufferSize_(bufferSize), bufferLast_(0), current_(buffer_), readCount_(0), count_(0), eof_(false) { 

         RAPIDJSON_ASSERT(fp_ != 0);

         RAPIDJSON_ASSERT(bufferSize >= 4);

         Read();

@@ -79,7 +80,7 @@ private:
         }

     }

 

-    FILE* fp_;

+    std::FILE* fp_;

     Ch *buffer_;

     size_t bufferSize_;

     Ch *bufferLast_;

@@ -89,6 +90,10 @@ private:
     bool eof_;

 };

 

-} // namespace rapidjson

+RAPIDJSON_NAMESPACE_END

+

+#ifdef __clang__

+RAPIDJSON_DIAG_POP

+#endif

 

 #endif // RAPIDJSON_FILESTREAM_H_