movre TSentry include up, possibly fixing windows actions issue with

macros

im really starting to appreciate that windows API includes clash with
each other because of macros, its super fun
This commit is contained in:
Lion Kortlepel 2021-08-10 11:35:22 +02:00 committed by Lion
parent ee1e948a65
commit f4fc182d5e
3 changed files with 6 additions and 6 deletions

View File

@ -1,5 +1,8 @@
#pragma once
#include "TSentry.h"
extern TSentry Sentry;
#include <atomic>
#include <deque>
#include <functional>
@ -79,9 +82,6 @@ void RegisterThread(const std::string str);
#define _line std::to_string(__LINE__)
#define _in_lambda (std::string(__func__) == "operator()")
#include "TSentry.h"
extern TSentry Sentry;
// we would like the full function signature 'void a::foo() const'
// on windows this is __FUNCSIG__, on GCC it's __PRETTY_FUNCTION__,
// feel free to add more

View File

@ -2,6 +2,7 @@
#define SENTRY_H
#include <sentry.h>
#include <string>
// TODO possibly use attach_stacktrace

View File

@ -1,6 +1,7 @@
#include "TSentry.h"
#include "Common.h"
#include "Http.h"
#include "TSentry.h"
#include "TConfig.h"
#include "THeartbeatThread.h"
#include "TLuaEngine.h"
@ -9,7 +10,6 @@
#include "TResourceManager.h"
#include "TServer.h"
#include <sentry.h>
#include <thread>
#ifdef __unix
@ -58,7 +58,6 @@ int main(int argc, char** argv) try {
TServer Server(argc, argv);
TConfig Config;
if (Config.Failed()) {
info("Closing in 10 seconds");
std::this_thread::sleep_for(std::chrono::seconds(10));