From 0d9987b43e695f5202c5d69a5e42ab70a678b04f Mon Sep 17 00:00:00 2001 From: Janusz Chorko Date: Fri, 26 Aug 2016 21:17:38 +0200 Subject: [PATCH 1/2] Removed non-compiling assignment operator. Fixed #718 Downstream report: https://bugs.gentoo.org/914581 See also: https://github.com/Tencent/rapidjson/issues/718 Signed-off-by: Andreas Sturmlechner (cherry-picked from rapidjson upstream commit 3b2441b87f99ab65f37b141a7b548ebadb607b96) --- src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h index e3e20dfbdc..b0f1f70beb 100644 --- a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h +++ b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h @@ -316,8 +316,6 @@ struct GenericStringRef { GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {} - GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; } - //! implicit conversion to plain CharType pointer operator const Ch *() const { return s; } -- GitLab From 4c88f2c0e61daa89f584a8a9a3eba210221c6920 Mon Sep 17 00:00:00 2001 From: Janusz Chorko Date: Fri, 26 Aug 2016 21:26:50 +0200 Subject: [PATCH 2/2] Explicitly disable copy assignment operator See also: https://github.com/Tencent/rapidjson/pull/719 Signed-off-by: Andreas Sturmlechner (cherry-picked from rapidjson upstream commit 862c39be371278a45a88d4d1d75164be57bb7e2d) --- src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h index b0f1f70beb..19f5a6a5ff 100644 --- a/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h +++ b/src/3rdparty/mapbox-gl-native/deps/rapidjson/1.1.0/include/rapidjson/document.h @@ -326,6 +326,8 @@ private: //! Disallow construction from non-const array template GenericStringRef(CharType (&str)[N]) /* = delete */; + //! Copy assignment operator not permitted - immutable type + GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */; }; //! Mark a character pointer as constant string -- GitLab