-
Notifications
You must be signed in to change notification settings - Fork 69
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rapidjson: Add patches for compatibility with new GCC
- Loading branch information
Showing
3 changed files
with
48 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 22 additions & 0 deletions
22
patches/rapidjson/3b2441b87f99ab65f37b141a7b548ebadb607b96.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From 3b2441b87f99ab65f37b141a7b548ebadb607b96 Mon Sep 17 00:00:00 2001 | ||
From: Janusz Chorko <[email protected]> | ||
Date: Fri, 26 Aug 2016 21:17:38 +0200 | ||
Subject: [PATCH] Removed non-compiling assignment operator. Fixed #718 | ||
|
||
--- | ||
include/rapidjson/document.h | 2 -- | ||
1 file changed, 2 deletions(-) | ||
|
||
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h | ||
index e3e20dfbd..b0f1f70be 100644 | ||
--- a/include/rapidjson/document.h | ||
+++ b/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; } | ||
|
22 changes: 22 additions & 0 deletions
22
patches/rapidjson/862c39be371278a45a88d4d1d75164be57bb7e2d.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
From 862c39be371278a45a88d4d1d75164be57bb7e2d Mon Sep 17 00:00:00 2001 | ||
From: Janusz Chorko <[email protected]> | ||
Date: Fri, 26 Aug 2016 21:26:50 +0200 | ||
Subject: [PATCH] Explicitly disable copy assignment operator | ||
|
||
--- | ||
include/rapidjson/document.h | 2 ++ | ||
1 file changed, 2 insertions(+) | ||
|
||
diff --git a/include/rapidjson/document.h b/include/rapidjson/document.h | ||
index b0f1f70be..19f5a6a5f 100644 | ||
--- a/include/rapidjson/document.h | ||
+++ b/include/rapidjson/document.h | ||
@@ -326,6 +326,8 @@ struct GenericStringRef { | ||
//! Disallow construction from non-const array | ||
template<SizeType N> | ||
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 |