Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-24 22:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

update AMF3 logic and disable sanitizers on darwin

Browse Source
This commit is contained in:
jadebenn 2024-11-22 18:14:00 -08:00
parent ac4fd02a6c
commit 8eb3488812
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -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")

2
dCommon/Amf3.h
View File

@ -94,7 +94,7 @@ AMFValue(const char*) -> AMFValue<std::string>; // AMFStringValue
*/
class AMFArrayValue : public AMFBaseValue {
using AMFAssociative =
std::unordered_map<std::string, std::unique_ptr<AMFBaseValue>, GeneralUtils::transparent_string_hash, std::equal_to<>>;
std::unordered_map<std::string, std::unique_ptr<AMFBaseValue>, GeneralUtils::transparent_string_hash, std::equal_to<void>>;
using AMFDense = std::vector<std::unique_ptr<AMFBaseValue>>;

2
dCommon/GeneralUtils.h
View File

@ -137,7 +137,7 @@ namespace GeneralUtils {
template <typename... Bases>
struct overload : Bases... {
using is_transparent = void;
using Bases::operator() ... ;
using Bases::operator()...;
};
struct char_pointer_hash {