From 2d910838a278babb1a023f37166b5b8237dc3535 Mon Sep 17 00:00:00 2001 From: Arkshine Date: Wed, 30 Sep 2015 19:08:39 +0200 Subject: [PATCH] Fix AMTL internal paths --- amxmodx/CFileSystem.h | 89 +++++++++++----------- amxmodx/CGameConfigs.h | 6 +- amxmodx/CLibrarySys.h | 2 +- amxmodx/CPlugin.h | 4 +- amxmodx/CTextParsers.h | 2 +- amxmodx/CvarManager.h | 4 +- amxmodx/amxmodx.h | 4 +- amxmodx/binlog.h | 2 +- amxmodx/datastructs.cpp | 2 +- amxmodx/natives_handles.h | 2 +- amxmodx/trie_natives.h | 2 +- modules/cstrike/cstrike/CstrikeNatives.cpp | 2 +- modules/cstrike/cstrike/CstrikePlayer.h | 2 +- modules/engine/engine.h | 6 +- modules/fakemeta/fakemeta_amxx.h | 4 +- modules/fakemeta/fm_tr.h | 2 +- modules/fakemeta/forward.h | 2 +- modules/fakemeta/pdata_gc.cpp | 2 +- modules/geoip/geoip_natives.cpp | 4 +- modules/geoip/geoip_natives.h | 4 +- modules/hamsandwich/DataHandler.cpp | 4 +- modules/hamsandwich/DataHandler.h | 4 +- modules/hamsandwich/Trampolines.h | 2 +- modules/hamsandwich/amxx_api.cpp | 2 +- modules/hamsandwich/call_funcs.cpp | 4 +- modules/hamsandwich/forward.h | 2 +- modules/hamsandwich/hook.h | 2 +- modules/hamsandwich/hook_callbacks.cpp | 4 +- modules/hamsandwich/hook_native.cpp | 2 +- modules/hamsandwich/hook_specialbot.h | 2 +- modules/hamsandwich/srvcmd.cpp | 2 +- modules/mysqlx/handles.cpp | 2 +- modules/mysqlx/thread/BaseWorker.cpp | 2 +- modules/mysqlx/thread/BaseWorker.h | 2 +- modules/mysqlx/threading.h | 2 +- modules/ns/AllocString.h | 4 +- modules/ns/GameManager.h | 2 +- modules/ns/Hash.h | 4 +- modules/ns/LocationManager.h | 2 +- modules/ns/ParticleManager.h | 4 +- modules/ns/SpawnManager.h | 2 +- modules/ns/TitleManager.h | 2 +- modules/ns/natives/particles.cpp | 4 +- modules/nvault/Journal.h | 4 +- modules/nvault/NVault.cpp | 2 +- modules/nvault/NVault.h | 2 +- modules/nvault/amxxapi.h | 4 +- modules/regex/CRegEx.h | 4 +- modules/regex/module.cpp | 4 +- modules/sqlite/handles.cpp | 2 +- modules/sqlite/threading.cpp | 2 +- modules/sqlite/threading.h | 4 +- public/auto-string.h | 2 +- public/memtools/MemoryUtils.h | 2 +- public/sm_namehashset.h | 8 +- public/sm_stringhashmap.h | 8 +- 56 files changed, 128 insertions(+), 129 deletions(-) diff --git a/amxmodx/CFileSystem.h b/amxmodx/CFileSystem.h index a9d79f40..40bd76bb 100644 --- a/amxmodx/CFileSystem.h +++ b/amxmodx/CFileSystem.h @@ -12,7 +12,6 @@ #include // IFileSystem, FileSystemSeek_t, FileHandle_t (HLSDK) #include // FILE* -#include // KE_OVERRIDE extern IFileSystem* g_FileSystem; @@ -38,7 +37,7 @@ class FileObject virtual bool EndOfFile() = 0; virtual void Close() = 0; - virtual ValveFile *AsValveFile() + virtual ValveFile *AsValveFile() { return nullptr; } @@ -55,7 +54,7 @@ class ValveFile : public FileObject ValveFile(FileHandle_t handle) : handle_(handle) {} - ~ValveFile() + ~ValveFile() { Close(); } @@ -65,10 +64,10 @@ class ValveFile : public FileObject return g_FileSystem->FileExists(file); } - static ValveFile* Open(const char* filename, const char* mode, const char* pathID) + static ValveFile* Open(const char* filename, const char* mode, const char* pathID) { FileHandle_t handle = g_FileSystem->OpenFromCacheForRead(filename, mode, pathID); - + if (!handle) { return nullptr; @@ -77,7 +76,7 @@ class ValveFile : public FileObject return new ValveFile(handle); } - static bool Delete(const char* filename, const char* pathID) + static bool Delete(const char* filename, const char* pathID) { if (!Exists(filename)) { @@ -94,49 +93,49 @@ class ValveFile : public FileObject return true; } - size_t Read(void* pOut, size_t size) KE_OVERRIDE + size_t Read(void* pOut, size_t size) override { return static_cast(g_FileSystem->Read(pOut, size, handle_)); } - - char* ReadLine(char* pOut, size_t size) KE_OVERRIDE + + char* ReadLine(char* pOut, size_t size) override { return g_FileSystem->ReadLine(pOut, size, handle_); } - size_t Write(const void* pData, size_t size) KE_OVERRIDE + size_t Write(const void* pData, size_t size) override { return static_cast(g_FileSystem->Write(pData, size, handle_)); } - - bool Seek(int pos, int seek_type) KE_OVERRIDE + + bool Seek(int pos, int seek_type) override { g_FileSystem->Seek(handle_, pos, static_cast(seek_type)); return !HasError(); } - - int Tell() KE_OVERRIDE + + int Tell() override { return g_FileSystem->Tell(handle_); } - - bool HasError() KE_OVERRIDE + + bool HasError() override { return !handle_ || !g_FileSystem->IsOk(handle_); } - - int Flush() KE_OVERRIDE + + int Flush() override { g_FileSystem->Flush(handle_); return 0; } - - bool EndOfFile() KE_OVERRIDE + + bool EndOfFile() override { return g_FileSystem->EndOfFile(handle_); } - - void Close() KE_OVERRIDE + + void Close() override { if (handle_) { @@ -144,8 +143,8 @@ class ValveFile : public FileObject handle_ = nullptr;; } } - - virtual ValveFile* AsValveFile() + + virtual ValveFile* AsValveFile() { return this; } @@ -167,12 +166,12 @@ class SystemFile : public FileObject SystemFile(FILE* fp) : fp_(fp) {} - ~SystemFile() + ~SystemFile() { Close(); } - static SystemFile* Open(const char* path, const char* mode) + static SystemFile* Open(const char* path, const char* mode) { FILE* fp = fopen(path, mode); @@ -184,52 +183,52 @@ class SystemFile : public FileObject return new SystemFile(fp); } - static bool Delete(const char* path) + static bool Delete(const char* path) { return unlink(path) == 0; } - size_t Read(void* pOut, size_t size) KE_OVERRIDE + size_t Read(void* pOut, size_t size) override { return fread(pOut, 1, size, fp_); } - - char* ReadLine(char* pOut, size_t size) KE_OVERRIDE + + char* ReadLine(char* pOut, size_t size) override { return fgets(pOut, size, fp_); } - - size_t Write(const void* pData, size_t size) KE_OVERRIDE + + size_t Write(const void* pData, size_t size) override { return fwrite(pData, 1, size, fp_); } - - bool Seek(int pos, int seek_type) KE_OVERRIDE + + bool Seek(int pos, int seek_type) override { return fseek(fp_, pos, seek_type) == 0; } - - int Tell() KE_OVERRIDE + + int Tell() override { return ftell(fp_); } - - bool HasError() KE_OVERRIDE + + bool HasError() override { return ferror(fp_) != 0; } - - int Flush() KE_OVERRIDE + + int Flush() override { return fflush(fp_); } - - bool EndOfFile() KE_OVERRIDE + + bool EndOfFile() override { return feof(fp_) != 0; } - - void Close() KE_OVERRIDE + + void Close() override { if (fp_) { @@ -237,7 +236,7 @@ class SystemFile : public FileObject fp_ = nullptr; } } - + virtual SystemFile* AsSystemFile() { return this; diff --git a/amxmodx/CGameConfigs.h b/amxmodx/CGameConfigs.h index 75ec0b2e..72f31358 100644 --- a/amxmodx/CGameConfigs.h +++ b/amxmodx/CGameConfigs.h @@ -12,9 +12,9 @@ #include #include "CLibrarySys.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/amxmodx/CLibrarySys.h b/amxmodx/CLibrarySys.h index 935cac6c..29371c47 100644 --- a/amxmodx/CLibrarySys.h +++ b/amxmodx/CLibrarySys.h @@ -12,7 +12,7 @@ #include "amx.h" // cell #include // Interface (HLSDK) -#include // AutoPtr +#include // AutoPtr #define PLATFORM_WINDOWNS_NAME "windows" #define PLATFORM_LINUX_NAME "linux" diff --git a/amxmodx/CPlugin.h b/amxmodx/CPlugin.h index 9336acb3..60fb899f 100755 --- a/amxmodx/CPlugin.h +++ b/amxmodx/CPlugin.h @@ -13,8 +13,8 @@ #include "sh_list.h" #include "amx.h" #include "amxxfile.h" -#include -#include +#include +#include // ***************************************************** // class CPluginMngr diff --git a/amxmodx/CTextParsers.h b/amxmodx/CTextParsers.h index c05929c1..e3e9985f 100644 --- a/amxmodx/CTextParsers.h +++ b/amxmodx/CTextParsers.h @@ -33,7 +33,7 @@ #define _INCLUDE_SOURCEMOD_TEXTPARSERS_H_ #include -#include +#include /** * @param void * IN: Stream pointer diff --git a/amxmodx/CvarManager.h b/amxmodx/CvarManager.h index a82ef3bf..043caa7f 100644 --- a/amxmodx/CvarManager.h +++ b/amxmodx/CvarManager.h @@ -11,8 +11,8 @@ #define CVARS_H #include "amxmodx.h" -#include -#include +#include +#include #include class CDetour; diff --git a/amxmodx/amxmodx.h b/amxmodx/amxmodx.h index e9176dca..1ba87c6a 100755 --- a/amxmodx/amxmodx.h +++ b/amxmodx/amxmodx.h @@ -36,8 +36,8 @@ #include "CPlugin.h" #include "CLibrarySys.h" #include -#include -#include +#include +#include #include "CMisc.h" #include "CVault.h" #include "CModule.h" diff --git a/amxmodx/binlog.h b/amxmodx/binlog.h index b4275a31..6c8e6298 100644 --- a/amxmodx/binlog.h +++ b/amxmodx/binlog.h @@ -12,7 +12,7 @@ #if defined BINLOG_ENABLED -#include +#include #define BINLOG_MAGIC 0x414D424C #define BINLOG_VERSION 0x0300 diff --git a/amxmodx/datastructs.cpp b/amxmodx/datastructs.cpp index bb752fe3..cfa2f782 100644 --- a/amxmodx/datastructs.cpp +++ b/amxmodx/datastructs.cpp @@ -9,7 +9,7 @@ #include "amxmodx.h" #include "datastructs.h" -#include +#include NativeHandle ArrayHandles; diff --git a/amxmodx/natives_handles.h b/amxmodx/natives_handles.h index bd586c00..068b394e 100644 --- a/amxmodx/natives_handles.h +++ b/amxmodx/natives_handles.h @@ -10,7 +10,7 @@ #ifndef _NATIVES_NATIVES_HANDLES_H_ #define _NATIVES_NATIVES_HANDLES_H_ -#include +#include // Note: All handles start at 1. 0 and below are invalid handles. // This way, a plugin that doesn't initialize a vector or diff --git a/amxmodx/trie_natives.h b/amxmodx/trie_natives.h index 668f1a1b..c69d15b2 100644 --- a/amxmodx/trie_natives.h +++ b/amxmodx/trie_natives.h @@ -96,7 +96,7 @@ public: } private: - Entry(const Entry &other) KE_DELETE; + Entry(const Entry &other) = delete; ArrayInfo *ensureArray(size_t bytes) { ArrayInfo *array = raw(); diff --git a/modules/cstrike/cstrike/CstrikeNatives.cpp b/modules/cstrike/cstrike/CstrikeNatives.cpp index a5f72413..161be814 100644 --- a/modules/cstrike/cstrike/CstrikeNatives.cpp +++ b/modules/cstrike/cstrike/CstrikeNatives.cpp @@ -18,7 +18,7 @@ #include "CstrikeUserMessages.h" #include "CstrikeHLTypeConversion.h" #include -#include +#include bool NoKifesMode = false; diff --git a/modules/cstrike/cstrike/CstrikePlayer.h b/modules/cstrike/cstrike/CstrikePlayer.h index fa78644e..8fdd34bf 100644 --- a/modules/cstrike/cstrike/CstrikePlayer.h +++ b/modules/cstrike/cstrike/CstrikePlayer.h @@ -17,7 +17,7 @@ #include #include "CstrikeUtils.h" #include "CstrikeHacks.h" -#include +#include extern ke::Vector ModelsUpdateQueue; diff --git a/modules/engine/engine.h b/modules/engine/engine.h index 1b5337d5..e46fe7c0 100644 --- a/modules/engine/engine.h +++ b/modules/engine/engine.h @@ -23,9 +23,9 @@ #include "entity.h" #include "gpglobals.h" #include "entity_state.h" -#include -#include -#include "CDetour/detours.h" +#include +#include +#include extern DLL_FUNCTIONS *g_pFunctionTable; extern DLL_FUNCTIONS *g_pFunctionTable_Post; diff --git a/modules/fakemeta/fakemeta_amxx.h b/modules/fakemeta/fakemeta_amxx.h index ea0757c7..f559c463 100644 --- a/modules/fakemeta/fakemeta_amxx.h +++ b/modules/fakemeta/fakemeta_amxx.h @@ -23,8 +23,8 @@ #include "forward.h" #include "fm_tr.h" #include "glb.h" -#include -#include +#include +#include #include #include diff --git a/modules/fakemeta/fm_tr.h b/modules/fakemeta/fm_tr.h index e14eb40d..11ee26ba 100644 --- a/modules/fakemeta/fm_tr.h +++ b/modules/fakemeta/fm_tr.h @@ -14,7 +14,7 @@ #ifndef _INCLUDE_TR_H #define _INCLUDE_TR_H -#include +#include extern TraceResult *gfm_tr; diff --git a/modules/fakemeta/forward.h b/modules/fakemeta/forward.h index 26e3b1db..132e9232 100644 --- a/modules/fakemeta/forward.h +++ b/modules/fakemeta/forward.h @@ -14,7 +14,7 @@ #ifndef _INCLUDE_FORWARD_H #define _INCLUDE_FORWARD_H -#include +#include #define ENGFUNC_NUM FM_LAST_DONT_USE_ME // 131 diff --git a/modules/fakemeta/pdata_gc.cpp b/modules/fakemeta/pdata_gc.cpp index e61ef5d4..1df45d48 100644 --- a/modules/fakemeta/pdata_gc.cpp +++ b/modules/fakemeta/pdata_gc.cpp @@ -12,7 +12,7 @@ // #include "fakemeta_amxx.h" -#include +#include enum class BaseFieldType { diff --git a/modules/geoip/geoip_natives.cpp b/modules/geoip/geoip_natives.cpp index 65528f8b..3d58f538 100644 --- a/modules/geoip/geoip_natives.cpp +++ b/modules/geoip/geoip_natives.cpp @@ -15,8 +15,8 @@ #include "geoip_natives.h" #include "geoip_util.h" -#include -#include +#include +#include // native geoip_code2(const ip[], ccode[3]); // Deprecated. diff --git a/modules/geoip/geoip_natives.h b/modules/geoip/geoip_natives.h index 06f6d216..0b1ac6de 100644 --- a/modules/geoip/geoip_natives.h +++ b/modules/geoip/geoip_natives.h @@ -14,8 +14,8 @@ #ifndef _INCLUDE_GEOIPNATIVES_H #define _INCLUDE_GEOIPNATIVES_H -#include -#include +#include +#include extern MMDB_s HandleDB; extern ke::Vector LangList; diff --git a/modules/hamsandwich/DataHandler.cpp b/modules/hamsandwich/DataHandler.cpp index f99135c3..b212c7a8 100644 --- a/modules/hamsandwich/DataHandler.cpp +++ b/modules/hamsandwich/DataHandler.cpp @@ -13,8 +13,8 @@ #include "amxxmodule.h" -#include -#include +#include +#include #include #include "DataHandler.h" diff --git a/modules/hamsandwich/DataHandler.h b/modules/hamsandwich/DataHandler.h index 3677ac1a..f49ca085 100644 --- a/modules/hamsandwich/DataHandler.h +++ b/modules/hamsandwich/DataHandler.h @@ -15,8 +15,8 @@ #define RETURNHANDLER_H #include "ham_utils.h" -#include -#include +#include +#include #include enum diff --git a/modules/hamsandwich/Trampolines.h b/modules/hamsandwich/Trampolines.h index bda725d0..954e513e 100644 --- a/modules/hamsandwich/Trampolines.h +++ b/modules/hamsandwich/Trampolines.h @@ -41,7 +41,7 @@ #include // memalign #include -#include +#include namespace Trampolines { diff --git a/modules/hamsandwich/amxx_api.cpp b/modules/hamsandwich/amxx_api.cpp index 9deb67e3..d48a05a7 100644 --- a/modules/hamsandwich/amxx_api.cpp +++ b/modules/hamsandwich/amxx_api.cpp @@ -15,7 +15,7 @@ #include #include "NEW_Util.h" -#include +#include #include "forward.h" #include "hook.h" #include "ham_const.h" diff --git a/modules/hamsandwich/call_funcs.cpp b/modules/hamsandwich/call_funcs.cpp index 23ad8e87..8b5494fc 100644 --- a/modules/hamsandwich/call_funcs.cpp +++ b/modules/hamsandwich/call_funcs.cpp @@ -18,8 +18,8 @@ #include "hooklist.h" #include "forward.h" #include "hook.h" -#include -#include +#include +#include extern ke::Vector hooks[HAM_LAST_ENTRY_DONT_USE_ME_LOL]; diff --git a/modules/hamsandwich/forward.h b/modules/hamsandwich/forward.h index 6f95b14e..d896d573 100644 --- a/modules/hamsandwich/forward.h +++ b/modules/hamsandwich/forward.h @@ -16,7 +16,7 @@ #ifndef FORWARD_H #define FORWARD_H -#include +#include enum fwdstate { diff --git a/modules/hamsandwich/hook.h b/modules/hamsandwich/hook.h index 1db43642..f57bfcb8 100644 --- a/modules/hamsandwich/hook.h +++ b/modules/hamsandwich/hook.h @@ -16,7 +16,7 @@ #include "forward.h" #include "Trampolines.h" -#include +#include #define ALIGN(ar) ((intptr_t)ar & ~(sysconf(_SC_PAGESIZE)-1)) diff --git a/modules/hamsandwich/hook_callbacks.cpp b/modules/hamsandwich/hook_callbacks.cpp index fa396bd9..39d4c333 100644 --- a/modules/hamsandwich/hook_callbacks.cpp +++ b/modules/hamsandwich/hook_callbacks.cpp @@ -19,8 +19,8 @@ #include #include "amxxmodule.h" -#include -#include +#include +#include #include #include "hook.h" diff --git a/modules/hamsandwich/hook_native.cpp b/modules/hamsandwich/hook_native.cpp index 27416828..a9544513 100644 --- a/modules/hamsandwich/hook_native.cpp +++ b/modules/hamsandwich/hook_native.cpp @@ -28,7 +28,7 @@ #include "hooklist.h" #include "ham_utils.h" #include "hook_specialbot.h" -#include +#include OffsetManager Offsets; diff --git a/modules/hamsandwich/hook_specialbot.h b/modules/hamsandwich/hook_specialbot.h index d1b1d932..6f47c4a4 100644 --- a/modules/hamsandwich/hook_specialbot.h +++ b/modules/hamsandwich/hook_specialbot.h @@ -15,7 +15,7 @@ #define HOOK_SPECIALBOT_H #include "ham_utils.h" -#include +#include #include "forward.h" class CRegisterHamParams diff --git a/modules/hamsandwich/srvcmd.cpp b/modules/hamsandwich/srvcmd.cpp index 303ce169..72ded5b1 100644 --- a/modules/hamsandwich/srvcmd.cpp +++ b/modules/hamsandwich/srvcmd.cpp @@ -13,7 +13,7 @@ #include "amxxmodule.h" #include -#include +#include #include "ham_const.h" #include "hooklist.h" #include "offsets.h" diff --git a/modules/mysqlx/handles.cpp b/modules/mysqlx/handles.cpp index db251638..8663d7b6 100644 --- a/modules/mysqlx/handles.cpp +++ b/modules/mysqlx/handles.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include "mysql2_header.h" struct QHandle diff --git a/modules/mysqlx/thread/BaseWorker.cpp b/modules/mysqlx/thread/BaseWorker.cpp index e8e9e474..c0f19517 100644 --- a/modules/mysqlx/thread/BaseWorker.cpp +++ b/modules/mysqlx/thread/BaseWorker.cpp @@ -8,7 +8,7 @@ // https://alliedmods.net/amxmodx-license #include "BaseWorker.h" -#include +#include BaseWorker::BaseWorker() : m_perFrame(SM_DEFAULT_THREADS_PER_FRAME), diff --git a/modules/mysqlx/thread/BaseWorker.h b/modules/mysqlx/thread/BaseWorker.h index 1dcfbc2a..eec29466 100644 --- a/modules/mysqlx/thread/BaseWorker.h +++ b/modules/mysqlx/thread/BaseWorker.h @@ -10,7 +10,7 @@ #ifndef _INCLUDE_SOURCEMOD_BASEWORKER_H #define _INCLUDE_SOURCEMOD_BASEWORKER_H -#include +#include #include "ThreadSupport.h" #define SM_DEFAULT_THREADS_PER_FRAME 1 diff --git a/modules/mysqlx/threading.h b/modules/mysqlx/threading.h index ef99a30a..9bc93ab7 100644 --- a/modules/mysqlx/threading.h +++ b/modules/mysqlx/threading.h @@ -16,7 +16,7 @@ #include "IThreader.h" #include "ISQLDriver.h" -#include +#include #include struct QueuedResultInfo diff --git a/modules/ns/AllocString.h b/modules/ns/AllocString.h index db633fe8..30d2b916 100644 --- a/modules/ns/AllocString.h +++ b/modules/ns/AllocString.h @@ -23,8 +23,8 @@ #ifndef ALLOCSTRING_H #define ALLOCSTRING_H -#include -#include +#include +#include class StringManager { diff --git a/modules/ns/GameManager.h b/modules/ns/GameManager.h index 5e693419..eefa5b25 100644 --- a/modules/ns/GameManager.h +++ b/modules/ns/GameManager.h @@ -17,7 +17,7 @@ #ifndef GAMEMANAGER_H #define GAMEMANAGER_H -#include +#include class GameManager { diff --git a/modules/ns/Hash.h b/modules/ns/Hash.h index a09f11b0..7181d458 100644 --- a/modules/ns/Hash.h +++ b/modules/ns/Hash.h @@ -14,8 +14,8 @@ #ifndef _HASH_H_ #define _HASH_H_ -#include -#include +#include +#include // Just a very simple hash map, no iteration or anything of the like (not needed) diff --git a/modules/ns/LocationManager.h b/modules/ns/LocationManager.h index 0c2c056a..3bd7ef71 100644 --- a/modules/ns/LocationManager.h +++ b/modules/ns/LocationManager.h @@ -14,7 +14,7 @@ #ifndef LOCATIONMANAGER_H #define LOCATIONMANAGER_H -#include +#include #include "GameManager.h" #include "TitleManager.h" diff --git a/modules/ns/ParticleManager.h b/modules/ns/ParticleManager.h index 239548ee..4f11fb09 100644 --- a/modules/ns/ParticleManager.h +++ b/modules/ns/ParticleManager.h @@ -14,8 +14,8 @@ #ifndef PARTICLEMANAGER_H #define PARTICLEMANAGER_H -#include -#include +#include +#include typedef struct psystem_s { diff --git a/modules/ns/SpawnManager.h b/modules/ns/SpawnManager.h index 4796d5b6..021ec0ab 100644 --- a/modules/ns/SpawnManager.h +++ b/modules/ns/SpawnManager.h @@ -14,7 +14,7 @@ #ifndef SPAWNMANAGER_H #define SPAWNMANAGER_H -#include +#include typedef struct spawndata_s { diff --git a/modules/ns/TitleManager.h b/modules/ns/TitleManager.h index 800259a4..b79aec8b 100644 --- a/modules/ns/TitleManager.h +++ b/modules/ns/TitleManager.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include "Hash.h" diff --git a/modules/ns/natives/particles.cpp b/modules/ns/natives/particles.cpp index cdf8dccf..69dcbafc 100644 --- a/modules/ns/natives/particles.cpp +++ b/modules/ns/natives/particles.cpp @@ -17,8 +17,8 @@ #include "utilfunctions.h" #include "NEW_Util.h" #include "ParticleManager.h" -#include -#include +#include +#include #define KVI(__KEY) PSKeyValueI(__KEY,amx,params) #define KVF(__KEY) PSKeyValueF(__KEY,amx,params) diff --git a/modules/nvault/Journal.h b/modules/nvault/Journal.h index bf51c1a1..d6555acd 100644 --- a/modules/nvault/Journal.h +++ b/modules/nvault/Journal.h @@ -15,9 +15,9 @@ #define _INCLUDE_JOURNAL_H #include "Binary.h" -#include +#include #include -#include +#include enum JOp { diff --git a/modules/nvault/NVault.cpp b/modules/nvault/NVault.cpp index 6ad1d75d..e501d69a 100644 --- a/modules/nvault/NVault.cpp +++ b/modules/nvault/NVault.cpp @@ -15,7 +15,7 @@ #include "amxxmodule.h" #include "NVault.h" #include "Binary.h" -#include +#include /** * :TODO: This beast calls strcpy()/new() way too much by creating new strings on the stack. diff --git a/modules/nvault/NVault.h b/modules/nvault/NVault.h index 09958670..06e1d405 100644 --- a/modules/nvault/NVault.h +++ b/modules/nvault/NVault.h @@ -14,7 +14,7 @@ #ifndef _INCLUDE_NVAULT_H #define _INCLUDE_NVAULT_H -#include +#include #include #include "IVault.h" #include "Journal.h" diff --git a/modules/nvault/amxxapi.h b/modules/nvault/amxxapi.h index f00f1319..3039350d 100644 --- a/modules/nvault/amxxapi.h +++ b/modules/nvault/amxxapi.h @@ -15,8 +15,8 @@ #define _INCLUDE_AMXXAPI_H #include "amxxmodule.h" -#include -#include +#include +#include #include extern AMX_NATIVE_INFO nVault_natives[]; diff --git a/modules/regex/CRegEx.h b/modules/regex/CRegEx.h index efd0d91f..593b6474 100644 --- a/modules/regex/CRegEx.h +++ b/modules/regex/CRegEx.h @@ -14,8 +14,8 @@ #ifndef _INCLUDE_CREGEX_H #define _INCLUDE_CREGEX_H -#include -#include +#include +#include /** * Maximum number of sub-patterns, here 50 (this should be a multiple of 3). diff --git a/modules/regex/module.cpp b/modules/regex/module.cpp index b62c4d4d..f1087cd1 100644 --- a/modules/regex/module.cpp +++ b/modules/regex/module.cpp @@ -14,8 +14,8 @@ #include #include "pcre.h" #include "amxxmodule.h" -#include -#include +#include +#include #include "CRegEx.h" #include "utils.h" diff --git a/modules/sqlite/handles.cpp b/modules/sqlite/handles.cpp index 0f02d379..b0dd5df2 100644 --- a/modules/sqlite/handles.cpp +++ b/modules/sqlite/handles.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include "sqlite_header.h" struct QHandle diff --git a/modules/sqlite/threading.cpp b/modules/sqlite/threading.cpp index 989cfdc5..e33f7467 100644 --- a/modules/sqlite/threading.cpp +++ b/modules/sqlite/threading.cpp @@ -14,7 +14,7 @@ #include "amxxmodule.h" #include "sqlite_header.h" #include "threading.h" -#include +#include MainThreader g_Threader; ThreadWorker *g_pWorker = NULL; diff --git a/modules/sqlite/threading.h b/modules/sqlite/threading.h index 7de0cbb2..45aff09e 100644 --- a/modules/sqlite/threading.h +++ b/modules/sqlite/threading.h @@ -16,8 +16,8 @@ #include "IThreader.h" #include "ISQLDriver.h" -#include -#include +#include +#include #include struct QueuedResultInfo diff --git a/public/auto-string.h b/public/auto-string.h index da7aec5e..677667a9 100644 --- a/public/auto-string.h +++ b/public/auto-string.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include namespace ke { diff --git a/public/memtools/MemoryUtils.h b/public/memtools/MemoryUtils.h index 2f22255f..d91fb8a5 100644 --- a/public/memtools/MemoryUtils.h +++ b/public/memtools/MemoryUtils.h @@ -32,7 +32,7 @@ #if defined(__linux__) || defined(__APPLE__) #include - #include + #include #include #endif diff --git a/public/sm_namehashset.h b/public/sm_namehashset.h index 34759444..a4558e00 100644 --- a/public/sm_namehashset.h +++ b/public/sm_namehashset.h @@ -29,7 +29,7 @@ * Version: $Id$ */ -#include +#include #ifndef _include_sourcemod_namehashset_h_ #define _include_sourcemod_namehashset_h_ @@ -40,9 +40,9 @@ * @brief Stores a set of uniquely named objects. */ -#include -#include -#include +#include +#include +#include #include "sm_stringhashmap.h" //namespace SourceMod diff --git a/public/sm_stringhashmap.h b/public/sm_stringhashmap.h index 755eb568..ee5533ff 100644 --- a/public/sm_stringhashmap.h +++ b/public/sm_stringhashmap.h @@ -44,10 +44,10 @@ * NameHashSet instead. */ -#include -#include -#include -#include +#include +#include +#include +#include #include //namespace SourceMod