diff --git a/3rdparty/rapidyaml/rapidyaml b/3rdparty/rapidyaml/rapidyaml index 213b201d26..119b604206 160000 --- a/3rdparty/rapidyaml/rapidyaml +++ b/3rdparty/rapidyaml/rapidyaml @@ -1 +1 @@ -Subproject commit 213b201d264139cd1b887790197e08850af628e3 +Subproject commit 119b6042064d3828819e428e32e5a0f3035d5643 diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake index 2742e19477..6d873d1041 100644 --- a/cmake/SearchForStuff.cmake +++ b/cmake/SearchForStuff.cmake @@ -55,7 +55,7 @@ if((GCC_VERSION VERSION_EQUAL "9.0" OR GCC_VERSION VERSION_GREATER "9.0") AND GC endif() find_optional_system_library(fmt 3rdparty/fmt/fmt 7.1.3) -find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0) +find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.11.1) find_optional_system_library(zstd 3rdparty/zstd 1.4.5) if (${zstd_TYPE} STREQUAL System) alias_library(Zstd::Zstd zstd::libzstd_shared) diff --git a/pcsx2/GameDatabase.cpp b/pcsx2/GameDatabase.cpp index c7ca084f84..28893a043a 100644 --- a/pcsx2/GameDatabase.cpp +++ b/pcsx2/GameDatabase.cpp @@ -868,9 +868,10 @@ u32 GameDatabaseSchema::GameEntry::applyGSHardwareFixes(Pcsx2Config::GSOptions& void GameDatabase::initDatabase() { ryml::Callbacks rymlCallbacks = ryml::get_callbacks(); - rymlCallbacks.m_error = [](const char* msg, size_t msg_len, ryml::Location loc, void*) { - Console.Error("[YAML] Parsing error at {%s}:{%s} (bufpos={%s}): {%s}", - loc.line, loc.col, loc.offset, msg); + rymlCallbacks.m_error_parse = [](c4::csubstr msg, ryml::ErrorDataParse const& errdata, void*) { + Console.Error("[YAML] Parsing error at {%zu}:{%zu} (bufpos={%zu}): {%.*s}", + errdata.ymlloc.line, errdata.ymlloc.col, errdata.ymlloc.offset, + (int)msg.len, msg.str); }; ryml::set_callbacks(rymlCallbacks); c4::set_error_callback([](const char* msg, size_t msg_size) {