From 8eb34888120134d22a34562bdbb4dd7b72b6419f Mon Sep 17 00:00:00 2001 From: jadebenn Date: Fri, 22 Nov 2024 18:14:00 -0800 Subject: [PATCH] update AMF3 logic and disable sanitizers on darwin --- CMakeLists.txt | 4 ++-- dCommon/Amf3.h | 2 +- dCommon/GeneralUtils.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 427564e7..a2affdc0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,8 @@ project(Darkflame ) # TEMP - Sanitizer flags -if (UNIX) -# add_compile_options("-fsanitize=address,undefined" "-fvisibility=default") +if (UNIX AND NOT APPLE) + # add_compile_options("-fsanitize=address,undefined" "-fvisibility=default") add_compile_options("-fsanitize=undefined" "-fvisibility=default") add_link_options("-fsanitize=undefined") diff --git a/dCommon/Amf3.h b/dCommon/Amf3.h index ad41600f..4c9f49d0 100644 --- a/dCommon/Amf3.h +++ b/dCommon/Amf3.h @@ -94,7 +94,7 @@ AMFValue(const char*) -> AMFValue; // AMFStringValue */ class AMFArrayValue : public AMFBaseValue { using AMFAssociative = - std::unordered_map, GeneralUtils::transparent_string_hash, std::equal_to<>>; + std::unordered_map, GeneralUtils::transparent_string_hash, std::equal_to>; using AMFDense = std::vector>; diff --git a/dCommon/GeneralUtils.h b/dCommon/GeneralUtils.h index 2c93b656..3c4ee285 100644 --- a/dCommon/GeneralUtils.h +++ b/dCommon/GeneralUtils.h @@ -137,7 +137,7 @@ namespace GeneralUtils { template struct overload : Bases... { using is_transparent = void; - using Bases::operator() ... ; + using Bases::operator()...; }; struct char_pointer_hash {