From 969cd933583b38511e99a7cf511cd9faf15acb27 Mon Sep 17 00:00:00 2001 From: Lion Kortlepel Date: Tue, 10 Aug 2021 10:43:51 +0200 Subject: [PATCH] rename Sentry to TSentry windows filenames arent case-sensitive so it doesnt know which sentry.h we mean. --- CMakeLists.txt | 2 +- include/Common.h | 2 +- include/{Sentry.h => TSentry.h} | 0 src/{Sentry.cpp => TSentry.cpp} | 2 +- src/main.cpp | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename include/{Sentry.h => TSentry.h} (100%) rename src/{Sentry.cpp => TSentry.cpp} (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d44a055..025fc72 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,7 @@ add_executable(BeamMP-Server include/TResourceManager.h src/TResourceManager.cpp include/THeartbeatThread.h src/THeartbeatThread.cpp include/Http.h src/Http.cpp - include/Sentry.h src/Sentry.cpp + include/TSentry.h src/TSentry.cpp include/TPPSMonitor.h src/TPPSMonitor.cpp include/TNetwork.h src/TNetwork.cpp) diff --git a/include/Common.h b/include/Common.h index 39729e5..da7af10 100644 --- a/include/Common.h +++ b/include/Common.h @@ -79,7 +79,7 @@ void RegisterThread(const std::string str); #define _line std::to_string(__LINE__) #define _in_lambda (std::string(__func__) == "operator()") -#include "Sentry.h" +#include "TSentry.h" extern TSentry Sentry; // we would like the full function signature 'void a::foo() const' diff --git a/include/Sentry.h b/include/TSentry.h similarity index 100% rename from include/Sentry.h rename to include/TSentry.h diff --git a/src/Sentry.cpp b/src/TSentry.cpp similarity index 99% rename from src/Sentry.cpp rename to src/TSentry.cpp index d6029f6..8571f99 100644 --- a/src/Sentry.cpp +++ b/src/TSentry.cpp @@ -1,4 +1,4 @@ -#include "Sentry.h" +#include "TSentry.h" #include "Common.h" TSentry::TSentry(const std::string& SentryUrl) { diff --git a/src/main.cpp b/src/main.cpp index a6d8379..c8624ce 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,6 @@ #include "Common.h" #include "Http.h" -#include "Sentry.h" +#include "TSentry.h" #include "TConfig.h" #include "THeartbeatThread.h" #include "TLuaEngine.h"