1
0
mirror of https://github.com/wolfpld/tracy.git synced 2025-03-20 07:40:02 +08:00

Wrap concurrentqueue in tracy namespace

This commit is contained in:
Arvid Gerstmann
2018-07-13 20:01:27 +02:00
parent 3e012cb762
commit 6b87aecdce
7 changed files with 55 additions and 50 deletions
+7 -2
View File
@@ -73,6 +73,9 @@
#include <array>
#include <thread> // partly for __WINPTHREADS_VERSION if on MinGW-w64 w/ POSIX threading
namespace tracy
{
// Platform-specific definitions of a numeric thread ID type and an invalid value
namespace moodycamel { namespace details {
template<typename thread_id_t> struct thread_id_converter {
@@ -692,8 +695,8 @@ class ConcurrentQueue
public:
struct ExplicitProducer;
typedef ::moodycamel::ProducerToken producer_token_t;
typedef ::moodycamel::ConsumerToken consumer_token_t;
typedef moodycamel::ProducerToken producer_token_t;
typedef moodycamel::ConsumerToken consumer_token_t;
typedef typename Traits::index_t index_t;
typedef typename Traits::size_t size_t;
@@ -3671,6 +3674,8 @@ inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a, ty
}
} /* namespace tracy */
#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif