Merge pull request #577

32a2633 no longer need to pass the size to rapidjson (Riccardo Spagni)
bd8e0fd add missing miniupnpc files, modify cmake to not build miniupnpc tests and to fix an issue with finding miniupnpcstrings (Riccardo Spagni)
7da9905 updated miniupnpc (Riccardo Spagni)

1 files changed, 160 insertions, 42 deletions

diff --git a/external/rapidjson/rapidjson.h b/external/rapidjson/rapidjson.h
index 3f743234d..d896a1445 100644
--- a/external/rapidjson/rapidjson.h
+++ b/external/rapidjson/rapidjson.h
@@ -1,32 +1,23 @@
-// 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_RAPIDJSON_H_

 #define RAPIDJSON_RAPIDJSON_H_

 

-// Copyright (c) 2011 Milo Yip (miloyip@gmail.com)

-// Version 0.1

-

 /*!\file rapidjson.h

     \brief common definitions and configuration

-

+    

     \see RAPIDJSON_CONFIG

  */

 

@@ -49,6 +40,111 @@
 #include <cstring>  // memset(), memcpy(), memmove(), memcmp()

 

 ///////////////////////////////////////////////////////////////////////////////

+// RAPIDJSON_VERSION_STRING

+//

+// ALWAYS synchronize the following 3 macros with corresponding variables in /CMakeLists.txt.

+//

+

+//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN

+// token stringification

+#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)

+#define RAPIDJSON_DO_STRINGIFY(x) #x

+//!@endcond

+

+/*! \def RAPIDJSON_MAJOR_VERSION

+    \ingroup RAPIDJSON_CONFIG

+    \brief Major version of RapidJSON in integer.

+*/

+/*! \def RAPIDJSON_MINOR_VERSION

+    \ingroup RAPIDJSON_CONFIG

+    \brief Minor version of RapidJSON in integer.

+*/

+/*! \def RAPIDJSON_PATCH_VERSION

+    \ingroup RAPIDJSON_CONFIG

+    \brief Patch version of RapidJSON in integer.

+*/

+/*! \def RAPIDJSON_VERSION_STRING

+    \ingroup RAPIDJSON_CONFIG

+    \brief Version of RapidJSON in "<major>.<minor>.<patch>" string format.

+*/

+#define RAPIDJSON_MAJOR_VERSION 1

+#define RAPIDJSON_MINOR_VERSION 0

+#define RAPIDJSON_PATCH_VERSION 2

+#define RAPIDJSON_VERSION_STRING \

+    RAPIDJSON_STRINGIFY(RAPIDJSON_MAJOR_VERSION.RAPIDJSON_MINOR_VERSION.RAPIDJSON_PATCH_VERSION)

+

+///////////////////////////////////////////////////////////////////////////////

+// RAPIDJSON_NAMESPACE_(BEGIN|END)

+/*! \def RAPIDJSON_NAMESPACE

+    \ingroup RAPIDJSON_CONFIG

+    \brief   provide custom rapidjson namespace

+

+    In order to avoid symbol clashes and/or "One Definition Rule" errors

+    between multiple inclusions of (different versions of) RapidJSON in

+    a single binary, users can customize the name of the main RapidJSON

+    namespace.

+

+    In case of a single nesting level, defining \c RAPIDJSON_NAMESPACE

+    to a custom name (e.g. \c MyRapidJSON) is sufficient.  If multiple

+    levels are needed, both \ref RAPIDJSON_NAMESPACE_BEGIN and \ref

+    RAPIDJSON_NAMESPACE_END need to be defined as well:

+

+    \code

+    // in some .cpp file

+    #define RAPIDJSON_NAMESPACE my::rapidjson

+    #define RAPIDJSON_NAMESPACE_BEGIN namespace my { namespace rapidjson {

+    #define RAPIDJSON_NAMESPACE_END   } }

+    #include "rapidjson/..."

+    \endcode

+

+    \see rapidjson

+ */

+/*! \def RAPIDJSON_NAMESPACE_BEGIN

+    \ingroup RAPIDJSON_CONFIG

+    \brief   provide custom rapidjson namespace (opening expression)

+    \see RAPIDJSON_NAMESPACE

+*/

+/*! \def RAPIDJSON_NAMESPACE_END

+    \ingroup RAPIDJSON_CONFIG

+    \brief   provide custom rapidjson namespace (closing expression)

+    \see RAPIDJSON_NAMESPACE

+*/

+#ifndef RAPIDJSON_NAMESPACE

+#define RAPIDJSON_NAMESPACE rapidjson

+#endif

+#ifndef RAPIDJSON_NAMESPACE_BEGIN

+#define RAPIDJSON_NAMESPACE_BEGIN namespace RAPIDJSON_NAMESPACE {

+#endif

+#ifndef RAPIDJSON_NAMESPACE_END

+#define RAPIDJSON_NAMESPACE_END }

+#endif

+

+///////////////////////////////////////////////////////////////////////////////

+// RAPIDJSON_HAS_STDSTRING

+

+#ifndef RAPIDJSON_HAS_STDSTRING

+#ifdef RAPIDJSON_DOXYGEN_RUNNING

+#define RAPIDJSON_HAS_STDSTRING 1 // force generation of documentation

+#else

+#define RAPIDJSON_HAS_STDSTRING 0 // no std::string support by default

+#endif

+/*! \def RAPIDJSON_HAS_STDSTRING

+    \ingroup RAPIDJSON_CONFIG

+    \brief Enable RapidJSON support for \c std::string

+

+    By defining this preprocessor symbol to \c 1, several convenience functions for using

+    \ref rapidjson::GenericValue with \c std::string are enabled, especially

+    for construction and comparison.

+

+    \hideinitializer

+*/

+#endif // !defined(RAPIDJSON_HAS_STDSTRING)

+

+#if RAPIDJSON_HAS_STDSTRING

+#include <string>

+#endif // RAPIDJSON_HAS_STDSTRING

+

+///////////////////////////////////////////////////////////////////////////////

 // RAPIDJSON_NO_INT64DEFINE

 

 /*! \def RAPIDJSON_NO_INT64DEFINE

@@ -82,9 +178,9 @@
 

 #ifndef RAPIDJSON_FORCEINLINE

 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN

-#ifdef _MSC_VER

+#if defined(_MSC_VER) && !defined(NDEBUG)

 #define RAPIDJSON_FORCEINLINE __forceinline

-#elif defined(__GNUC__) && __GNUC__ >= 4

+#elif defined(__GNUC__) && __GNUC__ >= 4 && !defined(NDEBUG)

 #define RAPIDJSON_FORCEINLINE __attribute__((always_inline))

 #else

 #define RAPIDJSON_FORCEINLINE

@@ -140,6 +236,8 @@
 #    define RAPIDJSON_ENDIAN RAPIDJSON_BIGENDIAN

 #  elif defined(__i386__) || defined(__alpha__) || defined(__ia64) || defined(__ia64__) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_ALPHA) || defined(__amd64) || defined(__amd64__) || defined(_M_AMD64) || defined(__x86_64) || defined(__x86_64__) || defined(_M_X64) || defined(__bfin__)

 #    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN

+#  elif defined(_MSC_VER) && defined(_M_ARM)

+#    define RAPIDJSON_ENDIAN RAPIDJSON_LITTLEENDIAN

 #  elif defined(RAPIDJSON_DOXYGEN_RUNNING)

 #    define RAPIDJSON_ENDIAN

 #  else

@@ -152,7 +250,7 @@
 

 //! Whether using 64-bit architecture

 #ifndef RAPIDJSON_64BIT

-#if defined(__LP64__) || defined(_WIN64)

+#if defined(__LP64__) || defined(_WIN64) || defined(__EMSCRIPTEN__)

 #define RAPIDJSON_64BIT 1

 #else

 #define RAPIDJSON_64BIT 0

@@ -167,10 +265,14 @@
     \param x pointer to align

 

     Some machines require strict data alignment. Currently the default uses 4 bytes

-    alignment. User can customize by defining the RAPIDJSON_ALIGN function macro.,

+    alignment. User can customize by defining the RAPIDJSON_ALIGN function macro.

 */

 #ifndef RAPIDJSON_ALIGN

-#define RAPIDJSON_ALIGN(x) ((x + 3u) & ~3u)

+#if RAPIDJSON_64BIT == 1

+#define RAPIDJSON_ALIGN(x) (((x) + static_cast<uint64_t>(7u)) & ~static_cast<uint64_t>(7u))

+#else

+#define RAPIDJSON_ALIGN(x) (((x) + 3u) & ~3u)

+#endif

 #endif

 

 ///////////////////////////////////////////////////////////////////////////////

@@ -238,20 +340,20 @@
 #ifdef RAPIDJSON_DOXYGEN_RUNNING

 #define RAPIDJSON_NO_SIZETYPEDEFINE

 #endif

-namespace rapidjson {

+RAPIDJSON_NAMESPACE_BEGIN

 //! Size type (for string lengths, array sizes, etc.)

 /*! RapidJSON uses 32-bit array/string indices even on 64-bit platforms,

     instead of using \c size_t. Users may override the SizeType by defining

     \ref RAPIDJSON_NO_SIZETYPEDEFINE.

 */

 typedef unsigned SizeType;

-} // namespace rapidjson

+RAPIDJSON_NAMESPACE_END

 #endif

 

 // always import std::size_t to rapidjson namespace

-namespace rapidjson {

+RAPIDJSON_NAMESPACE_BEGIN

 using std::size_t;

-} // namespace rapidjson

+RAPIDJSON_NAMESPACE_END

 

 ///////////////////////////////////////////////////////////////////////////////

 // RAPIDJSON_ASSERT

@@ -274,13 +376,14 @@ using std::size_t;
 

 // Adopt from boost

 #ifndef RAPIDJSON_STATIC_ASSERT

+#ifndef __clang__

 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN

-namespace rapidjson {

-

+#endif

+RAPIDJSON_NAMESPACE_BEGIN

 template <bool x> struct STATIC_ASSERTION_FAILURE;

 template <> struct STATIC_ASSERTION_FAILURE<true> { enum { value = 1 }; };

 template<int x> struct StaticAssertTest {};

-} // namespace rapidjson

+RAPIDJSON_NAMESPACE_END

 

 #define RAPIDJSON_JOIN(X, Y) RAPIDJSON_DO_JOIN(X, Y)

 #define RAPIDJSON_DO_JOIN(X, Y) RAPIDJSON_DO_JOIN2(X, Y)

@@ -291,15 +394,18 @@ template<int x> struct StaticAssertTest {};
 #else

 #define RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE 

 #endif

+#ifndef __clang__

 //!@endcond

+#endif

 

 /*! \def RAPIDJSON_STATIC_ASSERT

     \brief (Internal) macro to check for conditions at compile-time

     \param x compile-time condition

     \hideinitializer

  */

-#define RAPIDJSON_STATIC_ASSERT(x) typedef ::rapidjson::StaticAssertTest<\

-    sizeof(::rapidjson::STATIC_ASSERTION_FAILURE<bool(x) >)>\

+#define RAPIDJSON_STATIC_ASSERT(x) \

+    typedef ::RAPIDJSON_NAMESPACE::StaticAssertTest< \

+      sizeof(::RAPIDJSON_NAMESPACE::STATIC_ASSERTION_FAILURE<bool(x) >)> \

     RAPIDJSON_JOIN(StaticAssertTypedef, __LINE__) RAPIDJSON_STATIC_ASSERT_UNUSED_ATTRIBUTE

 #endif

 

@@ -316,10 +422,6 @@ template<int x> struct StaticAssertTest {};
 #define RAPIDJSON_VERSION_CODE(x,y,z) \

   (((x)*100000) + ((y)*100) + (z))

 

-// token stringification

-#define RAPIDJSON_STRINGIFY(x) RAPIDJSON_DO_STRINGIFY(x)

-#define RAPIDJSON_DO_STRINGIFY(x) #x

-

 ///////////////////////////////////////////////////////////////////////////////

 // RAPIDJSON_DIAG_PUSH/POP, RAPIDJSON_DIAG_OFF

 

@@ -367,7 +469,8 @@ template<int x> struct StaticAssertTest {};
 

 #ifndef RAPIDJSON_HAS_CXX11_RVALUE_REFS

 #if defined(__clang__)

-#define RAPIDJSON_HAS_CXX11_RVALUE_REFS __has_feature(cxx_rvalue_references)

+#define RAPIDJSON_HAS_CXX11_RVALUE_REFS __has_feature(cxx_rvalue_references) && \

+    (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__) && __GLIBCXX__ >= 20080306)

 #elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \

       (defined(_MSC_VER) && _MSC_VER >= 1600)

 

@@ -401,13 +504,28 @@ template<int x> struct StaticAssertTest {};
 //!@endcond

 

 ///////////////////////////////////////////////////////////////////////////////

+// new/delete

+

+#ifndef RAPIDJSON_NEW

+///! customization point for global \c new

+#define RAPIDJSON_NEW(x) new x

+#endif

+#ifndef RAPIDJSON_DELETE

+///! customization point for global \c delete

+#define RAPIDJSON_DELETE(x) delete x

+#endif

+

+///////////////////////////////////////////////////////////////////////////////

 // Allocators and Encodings

 

 #include "allocators.h"

 #include "encodings.h"

 

-//! main RapidJSON namespace

-namespace rapidjson {

+/*! \namespace rapidjson

+    \brief main RapidJSON namespace

+    \see RAPIDJSON_NAMESPACE

+*/

+RAPIDJSON_NAMESPACE_BEGIN

 

 ///////////////////////////////////////////////////////////////////////////////

 //  Stream

@@ -562,6 +680,6 @@ enum Type {
     kNumberType = 6     //!< number

 };

 

-} // namespace rapidjson

+RAPIDJSON_NAMESPACE_END

 

 #endif // RAPIDJSON_RAPIDJSON_H_