From 71ca0683d67eec9c4ddb54ade8c031d2e5b7d70f Mon Sep 17 00:00:00 2001 From: Andrey Voroshilov Date: Wed, 8 Jul 2020 03:48:37 -0700 Subject: [PATCH] Fixing preprocessor formatting --- client/TracyProfiler.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index ec5e9b5a..272278d4 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -913,7 +913,7 @@ struct ProfilerThreadData # endif }; -#ifdef TRACY_MANUAL_LIFETIME +# ifdef TRACY_MANUAL_LIFETIME ProfilerData* s_profilerData = nullptr; TRACY_API void StartupProfiler() { @@ -930,7 +930,7 @@ TRACY_API void ShutdownProfiler() delete s_profilerData; s_profilerData = nullptr; } -#else +# else static std::atomic profilerDataLock { 0 }; static std::atomic profilerData { nullptr }; @@ -952,7 +952,7 @@ static ProfilerData& GetProfilerData() } return *ptr; } -#endif +# endif static ProfilerThreadData& GetProfilerThreadData() { @@ -974,13 +974,13 @@ std::atomic& GetThreadNameData() { return GetProfilerData().thr TRACY_API LuaZoneState& GetLuaZoneState() { return GetProfilerThreadData().luaZoneState; } # endif -#ifdef TRACY_MANUAL_LIFETIME -#else +# ifdef TRACY_MANUAL_LIFETIME +# else namespace { const auto& __profiler_init = GetProfiler(); } -#endif +# endif #else TRACY_API void InitRPMallocThread() @@ -1022,7 +1022,7 @@ std::atomic& s_threadNameData = s_threadNameDataInstance; thread_local LuaZoneState init_order(104) s_luaZoneState { 0, false }; # endif -#ifdef TRACY_MANUAL_LIFETIME +# ifdef TRACY_MANUAL_LIFETIME Profiler* s_profiler = nullptr; TRACY_API void StartupProfiler() @@ -1035,10 +1035,10 @@ TRACY_API void ShutdownProfiler() s_profiler = nullptr; } TRACY_API Profiler& GetProfiler() { return *s_profiler; } -#else +# else static Profiler init_order(105) s_profiler; TRACY_API Profiler& GetProfiler() { return s_profiler; } -#endif +# endif TRACY_API moodycamel::ConcurrentQueue::ExplicitProducer* GetToken() { return s_token.ptr; } TRACY_API moodycamel::ConcurrentQueue& GetQueue() { return s_queue; }