From 0b74108e02536422b9557b64a1fbebaeaf6b4b97 Mon Sep 17 00:00:00 2001 From: Mauro Leggieri Date: Wed, 1 May 2024 19:50:02 -0300 Subject: [PATCH] Updated dependencies --- SUBMODULES.md | 4 ++-- Source/RapidJSON/build.vbs | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/SUBMODULES.md b/SUBMODULES.md index 8b0b11ea7..9b5bb6636 100644 --- a/SUBMODULES.md +++ b/SUBMODULES.md @@ -6,8 +6,8 @@ For each library, verify if the branch/tag is correct. ``` git subtree pull --prefix Source/ZipLib/Source https://github.com/madler/zlib v1.3.1 --squash -git subtree pull --prefix Source/ZipLib/MiniZipSource https://github.com/zlib-ng/minizip-ng 4.0.4 --squash -git subtree pull --prefix Source/OpenSSL/Source https://github.com/openssl/openssl openssl-3.2.1 --squash +git subtree pull --prefix Source/ZipLib/MiniZipSource https://github.com/zlib-ng/minizip-ng 4.0.5 --squash +git subtree pull --prefix Source/OpenSSL/Source https://github.com/openssl/openssl openssl-3.3.0 --squash git subtree pull --prefix Source/JsLib/DukTape/Source https://github.com/svaarala/duktape v2.7.0 --squash git subtree pull --prefix Source/JsLib/BigInteger https://github.com/peterolson/BigInteger.js master --squash git subtree pull --prefix Source/RapidJSON/Source https://github.com/Tencent/rapidjson master --squash diff --git a/Source/RapidJSON/build.vbs b/Source/RapidJSON/build.vbs index 37350f4ae..cbd9db1e8 100644 --- a/Source/RapidJSON/build.vbs +++ b/Source/RapidJSON/build.vbs @@ -221,10 +221,17 @@ Dim dtBuildDate, bRebuild oFile.WriteLine "" oFile.WriteLine "__inline const Value* LookupMember(_In_ const Value &parent, _In_z_ LPCSTR szMemberNameA)" oFile.WriteLine "{" - oFile.WriteLine " const rapidjson::Value::ConstMemberIterator &member = parent.FindMember(szMemberNameA);" + oFile.WriteLine " const Value::ConstMemberIterator &member = parent.FindMember(szMemberNameA);" oFile.WriteLine " return (member != parent.MemberEnd()) ? &(member->value) : NULL;" oFile.WriteLine "}" oFile.WriteLine "" + oFile.WriteLine "__inline const Value& LookupMemberRef(_In_ const Value &parent, _In_z_ LPCSTR szMemberNameA)" + oFile.WriteLine "{" + oFile.WriteLine " static const Value nullValue;" + oFile.WriteLine " const Value::ConstMemberIterator &member = parent.FindMember(szMemberNameA);" + oFile.WriteLine " return (member != parent.MemberEnd()) ? member->value : nullValue;" + oFile.WriteLine "}" + oFile.WriteLine "" oFile.WriteLine "} //namespace rapidjson" oFile.WriteLine "" oFile.WriteLine "//------------------------------------------------------------------------------"