Merge pull request #1084

5850122 remove errant target_link_libraries (Riccardo Spagni)
58abc09 don't build any miniupnpc executables (Riccardo Spagni)
114e368 don't build miniupnpc test executables (Riccardo Spagni)
bb69371 updated miniupnp (Riccardo Spagni)
f62ebc5 update rapidjson (Riccardo Spagni)

1 files changed, 46 insertions, 37 deletions

diff --git a/external/rapidjson/internal/swap.h b/external/rapidjson/internal/swap.h
index 39bc2e464..666e49f97 100644
--- a/external/rapidjson/internal/swap.h
+++ b/external/rapidjson/internal/swap.h
@@ -1,37 +1,46 @@
-// 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.

-//

-// 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

-//

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

-//

-// 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_INTERNAL_SWAP_H_

-#define RAPIDJSON_INTERNAL_SWAP_H_

-

-#include "../rapidjson.h"

-

-RAPIDJSON_NAMESPACE_BEGIN

-namespace internal {

-

-//! Custom swap() to avoid dependency on C++ <algorithm> header

-/*! \tparam T Type of the arguments to swap, should be instantiated with primitive C++ types only.

-    \note This has the same semantics as std::swap().

-*/

-template <typename T>

-inline void Swap(T& a, T& b) RAPIDJSON_NOEXCEPT {

-    T tmp = a;

-        a = b;

-        b = tmp;

-}

-

-} // namespace internal

-RAPIDJSON_NAMESPACE_END

-

-#endif // RAPIDJSON_INTERNAL_SWAP_H_

+// 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.
+//
+// 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
+//
+// http://opensource.org/licenses/MIT
+//
+// 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_INTERNAL_SWAP_H_
+#define RAPIDJSON_INTERNAL_SWAP_H_
+
+#include "../rapidjson.h"
+
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+//! Custom swap() to avoid dependency on C++ <algorithm> header
+/*! \tparam T Type of the arguments to swap, should be instantiated with primitive C++ types only.
+    \note This has the same semantics as std::swap().
+*/
+template <typename T>
+inline void Swap(T& a, T& b) RAPIDJSON_NOEXCEPT {
+    T tmp = a;
+        a = b;
+        b = tmp;
+}
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_INTERNAL_SWAP_H_