diff options
| author | B. Stack <bgstack15@gmail.com> | 2022-06-27 11:13:49 -0400 |
|---|---|---|
| committer | B. Stack <bgstack15@gmail.com> | 2022-06-27 11:13:49 -0400 |
| commit | 83c49830d173c2f763960417221d9826ec4add94 (patch) | |
| tree | 744d5d5a840cc83203450b6b4838596003249752 /freefilesync/ffs_no_gcc12.patch | |
| parent | merge freefilesync-bump into freefilesync-el8 (diff) | |
| download | stackrpms-83c49830d173c2f763960417221d9826ec4add94.tar.gz stackrpms-83c49830d173c2f763960417221d9826ec4add94.tar.bz2 stackrpms-83c49830d173c2f763960417221d9826ec4add94.zip | |
ffs 11.22 rpm rc1
Diffstat (limited to 'freefilesync/ffs_no_gcc12.patch')
| -rw-r--r-- | freefilesync/ffs_no_gcc12.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/freefilesync/ffs_no_gcc12.patch b/freefilesync/ffs_no_gcc12.patch index 666036d..b25edac 100644 --- a/freefilesync/ffs_no_gcc12.patch +++ b/freefilesync/ffs_no_gcc12.patch @@ -1,7 +1,7 @@ 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 @@ -61,14 +61,3 @@ Distro: any distro with g++ < 12 //------------------------------------------------------------------ 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; - }; - |