From 801ea3f777ac3c61faa1b8737ac3ee979b3a7ce8 Mon Sep 17 00:00:00 2001
From: Lion Kortlepel <development@kortlepel.com>
Date: Tue, 3 Nov 2020 12:10:08 +0100
Subject: [PATCH] Fix windows naming issue with assert

---
 include/Buffer.h                     | 2 +-
 include/Client.hpp                   | 2 +-
 include/{Assert.h => CustomAssert.h} | 0
 include/Lua/luaconf.h                | 2 +-
 include/UnixCompat.h                 | 4 ++--
 src/Enc.cpp                          | 4 ++--
 src/Init/Config.cpp                  | 2 +-
 src/Network/Http.cpp                 | 2 +-
 src/main.cpp                         | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename include/{Assert.h => CustomAssert.h} (100%)

diff --git a/include/Buffer.h b/include/Buffer.h
index 83d5205..204e299 100644
--- a/include/Buffer.h
+++ b/include/Buffer.h
@@ -3,7 +3,7 @@
 ///
 #pragma once
 #include <mutex>
-#include "Assert.h"
+#include "CustomAssert.h"
 class Client;
 void GParser(Client*c, const std::string&Packet);
 class Buffer{
diff --git a/include/Client.hpp b/include/Client.hpp
index 9f2cf9e..5344f46 100644
--- a/include/Client.hpp
+++ b/include/Client.hpp
@@ -10,7 +10,7 @@
 #define SOCKET int
 #endif
 #include "Buffer.h"
-#include "Assert.h"
+#include "CustomAssert.h"
 #include <string>
 #include <vector>
 #include <chrono>
diff --git a/include/Assert.h b/include/CustomAssert.h
similarity index 100%
rename from include/Assert.h
rename to include/CustomAssert.h
diff --git a/include/Lua/luaconf.h b/include/Lua/luaconf.h
index f955556..78f40e7 100644
--- a/include/Lua/luaconf.h
+++ b/include/Lua/luaconf.h
@@ -706,7 +706,7 @@
 ** Define it as a help when debugging C code.
 */
 #if defined(LUA_USE_APICHECK)
-#include <assert.h>
+#include <CustomAssert.h>
 #define luai_apicheck(l,e)	assert(e)
 #endif
 
diff --git a/include/UnixCompat.h b/include/UnixCompat.h
index bfaf81f..a2042cc 100644
--- a/include/UnixCompat.h
+++ b/include/UnixCompat.h
@@ -6,13 +6,13 @@
 
 #ifndef WIN32
 
-#include <cassert>
+#include "CustomAssert.h"
 #include <cstring>
 #include <unistd.h>
 
 // ZeroMemory is just a {0} or a memset(addr, 0, len), and it's a macro on MSVC
 inline void ZeroMemory(void* dst, size_t len) {
-    assert(std::memset(dst, 0, len) != nullptr);
+    Assert(std::memset(dst, 0, len) != nullptr);
 }
 // provides unix equivalent of closesocket call in win32
 inline void closesocket(int socket) {
diff --git a/src/Enc.cpp b/src/Enc.cpp
index 90b9939..a7affa0 100644
--- a/src/Enc.cpp
+++ b/src/Enc.cpp
@@ -3,12 +3,12 @@
 ///
 #include "Security/Enc.h"
 #include "Settings.h"
+#include "CustomAssert.h"
 //#include <windows.h>
 #include "Logger.h"
 #include <sstream>
 #include <thread>
 #include <random>
-#include <cassert>
 
 int Rand(){
     std::random_device r;
@@ -87,7 +87,7 @@ int Dec(int value,int d,int n){
 
 #ifdef WIN32
 int Handle(EXCEPTION_POINTERS *ep,char* Origin){
-    assert(false);
+    Assert\(false);
     std::stringstream R;
     R << Sec("Code : ") << std::hex
     << ep->ExceptionRecord->ExceptionCode
diff --git a/src/Init/Config.cpp b/src/Init/Config.cpp
index 3d91176..0c2d294 100644
--- a/src/Init/Config.cpp
+++ b/src/Init/Config.cpp
@@ -3,7 +3,7 @@
 ///
 #include "Security/Enc.h"
 #include "Logger.h"
-#include "Assert.h"
+#include "CustomAssert.h"
 #include <fstream>
 #include <string>
 #include <thread>
diff --git a/src/Network/Http.cpp b/src/Network/Http.cpp
index b46e5c2..d2fd184 100644
--- a/src/Network/Http.cpp
+++ b/src/Network/Http.cpp
@@ -3,7 +3,7 @@
 ///
 #define CURL_STATICLIB
 #include "Curl/curl.h"
-#include "Assert.h"
+#include "CustomAssert.h"
 #include <iostream>
 static size_t WriteCallback(void *contents, size_t size, size_t nmemb, void *userp){
     ((std::string*)userp)->append((char*)contents, size * nmemb);
diff --git a/src/main.cpp b/src/main.cpp
index 1b74071..d6067a2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 #include "Startup.h"
-#include "Assert.h"
+#include "CustomAssert.h"
 #include <thread>
 #include <iostream>
 [[noreturn]] void loop(){