From 4c397ebe1e7806d0e710711926dae951653f4f94 Mon Sep 17 00:00:00 2001 From: Andrey Voroshilov Date: Sun, 12 Jul 2020 10:12:50 -0700 Subject: [PATCH] Fixing some of the copy-paste errors --- client/TracyProfiler.cpp | 4 ++-- client/TracyProfiler.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/client/TracyProfiler.cpp b/client/TracyProfiler.cpp index ad31dda3..f52db989 100644 --- a/client/TracyProfiler.cpp +++ b/client/TracyProfiler.cpp @@ -1025,8 +1025,8 @@ thread_local LuaZoneState init_order(104) s_luaZoneState { 0, false }; static Profiler init_order(105) s_profiler; TRACY_API moodycamel::ConcurrentQueue::ExplicitProducer* GetToken() { return s_token.ptr; } -TRACY_API moodycamel::ConcurrentQueue& GetQueue() { return s_queue; } TRACY_API Profiler& GetProfiler() { return s_profiler; } +TRACY_API moodycamel::ConcurrentQueue& GetQueue() { return s_queue; } TRACY_API int64_t GetInitTime() { return s_initTime.val; } TRACY_API std::atomic& GetLockCounter() { return s_lockCounter; } TRACY_API std::atomic& GetGpuCtxCounter() { return s_gpuCtxCounter; } @@ -1105,7 +1105,7 @@ Profiler::Profiler() m_userPort = atoi( userPort ); } -#if !defined(TRACY_DELAYED_INIT) || !defined(TRACY_NONSTATIC_PROFILER) +#if !defined(TRACY_DELAYED_INIT) || !defined(TRACY_MANUAL_LIFETIME) SpawnWorkerThreads(); #endif } diff --git a/client/TracyProfiler.hpp b/client/TracyProfiler.hpp index 0a9a16ee..87c4c098 100644 --- a/client/TracyProfiler.hpp +++ b/client/TracyProfiler.hpp @@ -41,7 +41,7 @@ namespace tracy { -#if defined(TRACY_DELAYED_INIT) && defined(TRACY_NONSTATIC_PROFILER) +#if defined(TRACY_DELAYED_INIT) && defined(TRACY_MANUAL_LIFETIME) void StartupProfiler(); void ShutdownProfiler(); #endif