From 04cecd4e50a1feefedb68fea39203eb7a890fd78 Mon Sep 17 00:00:00 2001 From: OEOTYAN Date: Mon, 12 Feb 2024 03:08:17 +0800 Subject: [PATCH] format: formatting files --- src/ll/api/memory/Hook.h | 2 +- src/ll/api/memory/MemoryOperators.h | 18 +++++++++--------- src/mc/common/wrapper/WeakRef.h | 2 +- src/mc/server/commands/CommandRegistry.h | 2 +- src/mc/util/ExpressionNode.h | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ll/api/memory/Hook.h b/src/ll/api/memory/Hook.h index 5c75faeff2..f31368d85b 100644 --- a/src/ll/api/memory/Hook.h +++ b/src/ll/api/memory/Hook.h @@ -244,7 +244,7 @@ struct __declspec(empty_bases) Hook {}; #define LL_AUTO_REG_HOOK_IMPL(FUNC_PTR, STATIC, CALL, DEF_TYPE, ...) \ LL_VA_EXPAND(LL_HOOK_IMPL( \ - inline ::ll::memory::HookRegistrar DEF_TYPE##AutoRegister, \ + inline ::ll::memory::HookRegistrar DEF_TYPE##AutoRegister, \ FUNC_PTR, \ STATIC, \ CALL, \ diff --git a/src/ll/api/memory/MemoryOperators.h b/src/ll/api/memory/MemoryOperators.h index 3b360d730a..c0d879c111 100644 --- a/src/ll/api/memory/MemoryOperators.h +++ b/src/ll/api/memory/MemoryOperators.h @@ -9,13 +9,11 @@ #include "ll/api/memory/Memory.h" -using ll::memory::getDefaultAllocator; - __declspec(noreturn) void __CRTDECL __scrt_throw_std_bad_alloc(); __declspec(noreturn) void __CRTDECL __scrt_throw_std_bad_array_new_length(); -void __CRTDECL operator delete(void* p) noexcept { getDefaultAllocator().release(p); } +void __CRTDECL operator delete(void* p) noexcept { ::ll::memory::getDefaultAllocator().release(p); } void __CRTDECL operator delete(void* p, std::nothrow_t const&) noexcept { operator delete(p); } @@ -27,7 +25,9 @@ void __CRTDECL operator delete(void* p, std::size_t) noexcept { operator delete( void __CRTDECL operator delete[](void* p, std::size_t) noexcept { operator delete[](p); }; -void __CRTDECL operator delete(void* p, std::align_val_t) noexcept { getDefaultAllocator().alignedRelease(p); } +void __CRTDECL operator delete(void* p, std::align_val_t) noexcept { + ::ll::memory::getDefaultAllocator().alignedRelease(p); +} void __CRTDECL operator delete(void* p, std::align_val_t alignment, std::nothrow_t const&) noexcept { operator delete(p, alignment); @@ -50,7 +50,7 @@ void __CRTDECL operator delete[](void* p, std::size_t, std::align_val_t alignmen _NODISCARD _Ret_notnull_ _Post_writable_byte_size_(size) _VCRT_ALLOCATOR void* __CRTDECL operator new(std::size_t size) { - if (void* const block = getDefaultAllocator().allocate(size)) { + if (void* const block = ::ll::memory::getDefaultAllocator().allocate(size)) { return block; } if (size == SIZE_MAX) { @@ -62,7 +62,7 @@ _VCRT_ALLOCATOR void* __CRTDECL operator new(std::size_t size) { _NODISCARD _Ret_notnull_ _Success_(return != NULL) _Post_writable_byte_size_(size) _VCRT_ALLOCATOR void* __CRTDECL operator new(std::size_t size, std::nothrow_t const&) noexcept { - return getDefaultAllocator().allocate(size); + return ::ll::memory::getDefaultAllocator().allocate(size); } _NODISCARD _Ret_notnull_ _Post_writable_byte_size_(size) @@ -76,7 +76,7 @@ operator new[](std::size_t size, std::nothrow_t const& tag) noexcept { _NODISCARD _Ret_notnull_ _Post_writable_byte_size_(size) _VCRT_ALLOCATOR void* __CRTDECL operator new(std::size_t size, std::align_val_t alignment) { - if (void* const block = getDefaultAllocator().alignedAllocate(size, static_cast(alignment))) { + if (void* const block = ::ll::memory::getDefaultAllocator().alignedAllocate(size, static_cast(alignment))) { return block; } if (size == SIZE_MAX) { @@ -88,7 +88,7 @@ _VCRT_ALLOCATOR void* __CRTDECL operator new(std::size_t size, std::align_val_t _NODISCARD _Ret_notnull_ _Success_(return != NULL) _Post_writable_byte_size_(size) _VCRT_ALLOCATOR void* __CRTDECL operator new(std::size_t size, std::align_val_t alignment, std::nothrow_t const&) noexcept { - return getDefaultAllocator().alignedAllocate(size, static_cast(alignment)); + return ::ll::memory::getDefaultAllocator().alignedAllocate(size, static_cast(alignment)); } _NODISCARD _Ret_notnull_ _Post_writable_byte_size_(size) @@ -100,4 +100,4 @@ _NODISCARD _Ret_notnull_ _Success_(return != NULL) _Post_writable_byte_size_(siz operator new[](std::size_t size, std::align_val_t alignment, std::nothrow_t const& tag) noexcept { return operator new(size, alignment, tag); } -#endif \ No newline at end of file +#endif diff --git a/src/mc/common/wrapper/WeakRef.h b/src/mc/common/wrapper/WeakRef.h index e07fc4dcf2..79dd94c09e 100644 --- a/src/mc/common/wrapper/WeakRef.h +++ b/src/mc/common/wrapper/WeakRef.h @@ -98,4 +98,4 @@ class WeakRef { constexpr T& operator*() const { return *get(); } constexpr T* operator->() const { return get(); } -}; \ No newline at end of file +}; diff --git a/src/mc/server/commands/CommandRegistry.h b/src/mc/server/commands/CommandRegistry.h index aadd4bec56..61f5af67a0 100644 --- a/src/mc/server/commands/CommandRegistry.h +++ b/src/mc/server/commands/CommandRegistry.h @@ -512,7 +512,7 @@ class CommandRegistry { std::string const& name, char const* description, // will copy to std::string ::CommandPermissionLevel requirement, - struct CommandFlag f, + struct CommandFlag f, struct CommandFlag = CommandFlagValue::None // useless, idiot ); diff --git a/src/mc/util/ExpressionNode.h b/src/mc/util/ExpressionNode.h index 052b9b795b..a33d6deae5 100644 --- a/src/mc/util/ExpressionNode.h +++ b/src/mc/util/ExpressionNode.h @@ -69,8 +69,8 @@ class ExpressionNode { // symbol: // ??0ExpressionNode@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@W4MolangVersion@@V?$span@$$CBVHashedString@@$0?0@gsl@@@Z MCAPI ExpressionNode( - std::string const& expression, - ::MolangVersion molangVersion = MolangVersion::Latest, + std::string const& expression, + ::MolangVersion molangVersion = MolangVersion::Latest, gsl::span querySetID = gsl::span{{HashedString{"default"}}} );