diff --git a/src/ll/api/memory/PatchHelper.h b/src/ll/api/memory/PatchHelper.h index 9865866d74..65647295e2 100644 --- a/src/ll/api/memory/PatchHelper.h +++ b/src/ll/api/memory/PatchHelper.h @@ -51,11 +51,11 @@ namespace ll::memory { template struct PatchHelper { - uchar data[len]; + uchar data[len]; using ref_t = uchar (&)[len]; - constexpr bool operator==(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) == 0; } - constexpr bool operator!=(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) != 0; } - constexpr bool operator==(PatchHelper const& ref) const noexcept { + constexpr bool operator==(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) == 0; } + constexpr bool operator!=(ref_t ref) const noexcept { return memcmp(data, ref, sizeof data) != 0; } + constexpr bool operator==(PatchHelper const& ref) const noexcept { return memcmp(data, ref.data, sizeof data) == 0; } constexpr bool operator!=(PatchHelper const& ref) const noexcept { diff --git a/src/mc/common/wrapper/optional_ref.h b/src/mc/common/wrapper/optional_ref.h index f996d128fc..a4660af112 100644 --- a/src/mc/common/wrapper/optional_ref.h +++ b/src/mc/common/wrapper/optional_ref.h @@ -104,7 +104,7 @@ class optional_ref { return std::invoke(*mPtr, static_cast(args)...); } template - [[nodiscard]] constexpr decltype(auto) operator[](Arg && index) const { + [[nodiscard]] constexpr decltype(auto) operator[](Arg&& index) const { return get()[std::forward(index)]; } [[nodiscard]] constexpr decltype(auto) end() { return get().end(); } diff --git a/src/mc/deps/core/common/bedrock/MemoryPage.h b/src/mc/deps/core/common/bedrock/MemoryPage.h index b4da05a4ac..b2a03c0213 100644 --- a/src/mc/deps/core/common/bedrock/MemoryPage.h +++ b/src/mc/deps/core/common/bedrock/MemoryPage.h @@ -35,7 +35,7 @@ class MemoryPage { // symbol: ?_allocate@MemoryPage@JSONObject@Bedrock@@AEAAPEAXP8123@EAA_K_K0@ZP8123@EAAPEAX00@Z00@Z MCAPI void* _allocate( uint64 (Bedrock::JSONObject::MemoryPage::*)(uint64, uint64), - void* (Bedrock::JSONObject::MemoryPage::*)(uint64, uint64), + void* (Bedrock::JSONObject::MemoryPage::*)(uint64, uint64), uint64 bytes, uint64 align ); diff --git a/src/mc/deps/core/utility/Util.h b/src/mc/deps/core/utility/Util.h index 590d384743..c73a431ce7 100644 --- a/src/mc/deps/core/utility/Util.h +++ b/src/mc/deps/core/utility/Util.h @@ -228,7 +228,7 @@ MCAPI std::vector splitLines( std::vector const& delims, bool includeDelimCharsInResult, bool includeEmptyLines, - std::istream& (*fnGetline)(std::istream&, std::string&) + std::istream& (*fnGetline)(std::istream&, std::string&) ); // symbol: diff --git a/src/mc/deps/raknet/RakPeer.h b/src/mc/deps/raknet/RakPeer.h index 72290426ad..3606c6188a 100644 --- a/src/mc/deps/raknet/RakPeer.h +++ b/src/mc/deps/raknet/RakPeer.h @@ -435,7 +435,7 @@ class RakPeer : public RakPeerInterface { // symbol: ?SetUserUpdateThread@RakPeer@RakNet@@UEAAXP6AXPEAVRakPeerInterface@2@PEAX@Z1@Z MCVAPI void SetUserUpdateThread( - void (*_userUpdateThreadPtr)(class RakNet::RakPeerInterface*, void*), + void (*_userUpdateThreadPtr)(class RakNet::RakPeerInterface*, void*), void* _userUpdateThreadData );