diff options
Diffstat (limited to 'freefilesync/ffs_no_gcc12.patch')
| -rw-r--r-- | freefilesync/ffs_no_gcc12.patch | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/freefilesync/ffs_no_gcc12.patch b/freefilesync/ffs_no_gcc12.patch index 88b0d27..b25edac 100644 --- a/freefilesync/ffs_no_gcc12.patch +++ b/freefilesync/ffs_no_gcc12.patch @@ -1,7 +1,9 @@ Message: Because we do not use gcc 12, we have an error with unordered_map and std::pair. Author: zensubz -Date-Modified: 2022-05-24 -Version: 11.21 +Date-Modified: 2022-06-27 +Version: 11.22 +Source: https://freefilesync.org/forum/viewtopic.php?t=9376&p=34044#p34044 +Distro: any distro with g++ < 12 --- a/FreeFileSync/Source/base/db_file.cpp +++ b/FreeFileSync/Source/base/db_file.cpp @@ -642,7 +642,7 @@ @@ -59,14 +61,3 @@ Version: 11.21 //------------------------------------------------------------------ FolderContainer() = default; ---- a/zen/json.h -+++ b/zen/json.h -@@ -41,7 +41,7 @@ - - Type type = Type::null; - std::string primVal; //for primitive types -- std::unordered_map<std::string, JsonValue> objectVal; //"[...] most implementations of JSON libraries do not accept duplicate keys [...]" => fine! -+ std::map<std::string, JsonValue> objectVal; //"[...] most implementations of JSON libraries do not accept duplicate keys [...]" => fine! - std::vector<JsonValue> arrayVal; - }; - |