From 7526486f3db29ab77952a14b505057543f9797a5 Mon Sep 17 00:00:00 2001 From: FutureRave Date: Sun, 19 Feb 2023 15:06:49 +0000 Subject: [PATCH] [General]: Cleanup --- deps/premake/discord-rpc.lua | 2 +- src/STDInclude.hpp | 21 +-------------------- src/Utils/Memory.cpp | 2 +- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/deps/premake/discord-rpc.lua b/deps/premake/discord-rpc.lua index 44b4e0a2..34f3ee4d 100644 --- a/deps/premake/discord-rpc.lua +++ b/deps/premake/discord-rpc.lua @@ -3,7 +3,7 @@ discordrpc = { } function discordrpc.import() - links { "discord-rpc" } + links "discord-rpc" discordrpc.includes() end diff --git a/src/STDInclude.hpp b/src/STDInclude.hpp index a6df1636..dd07cf6e 100644 --- a/src/STDInclude.hpp +++ b/src/STDInclude.hpp @@ -16,16 +16,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#pragma warning(push) -#pragma warning(disable: 4091) -#pragma warning(disable: 4244) #include #include @@ -51,8 +48,6 @@ #include #include -#pragma warning(pop) - #include #pragma comment(lib, "D3dx9.lib") @@ -64,21 +59,7 @@ // Ignore the warnings #pragma warning(push) -#pragma warning(disable: 4005) -#pragma warning(disable: 4091) #pragma warning(disable: 4100) -#pragma warning(disable: 4244) -#pragma warning(disable: 4389) -#pragma warning(disable: 4702) -#pragma warning(disable: 4800) -#pragma warning(disable: 5054) -#pragma warning(disable: 6001) -#pragma warning(disable: 6011) -#pragma warning(disable: 6031) -#pragma warning(disable: 6255) -#pragma warning(disable: 6258) -#pragma warning(disable: 6386) -#pragma warning(disable: 6387) #pragma warning(disable: 26812) // Enable additional literals diff --git a/src/Utils/Memory.cpp b/src/Utils/Memory.cpp index cf26b3ca..01c0b5b8 100644 --- a/src/Utils/Memory.cpp +++ b/src/Utils/Memory.cpp @@ -2,7 +2,7 @@ namespace Utils { - Utils::Memory::Allocator Memory::MemAllocator; + Memory::Allocator Memory::MemAllocator; void* Memory::AllocateAlign(std::size_t length, std::size_t alignment) {