mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-26 07:54:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename internal enum to avoid #define conflicts.

Browse Source
This commit is contained in:
Bartosz Taudul 2017-09-28 21:20:33 +02:00
parent 6ae62e6e5a
commit b9aa10913a
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/TracyProfiler.cpp
View File

@ -124,7 +124,7 @@ void Profiler::ZoneName( uint64_t id, QueueZoneName&& data )
void Profiler::FrameMark() void Profiler::FrameMark()
{ {
QueueItem item; QueueItem item;
item.hdr.type = QueueType::FrameMark; item.hdr.type = QueueType::FrameMarkMsg;
item.hdr.id = (uint64_t)GetTime(); item.hdr.id = (uint64_t)GetTime();
s_queue.enqueue( s_token, std::move( item ) ); s_queue.enqueue( s_token, std::move( item ) );
} }

2
common/TracyQueue.hpp
View File

@ -13,7 +13,7 @@ enum class QueueType : uint8_t
StringData, StringData,
ThreadName, ThreadName,
CustomStringData, CustomStringData,
FrameMark, FrameMarkMsg,
SourceLocation, SourceLocation,
ZoneText, ZoneText,
ZoneName, ZoneName,

2
server/TracyView.cpp
View File

@ -239,7 +239,7 @@ void View::Process( const QueueItem& ev )
case QueueType::ZoneEnd: case QueueType::ZoneEnd:
ProcessZoneEnd( ev.hdr.id, ev.zoneEnd ); ProcessZoneEnd( ev.hdr.id, ev.zoneEnd );
break; break;
case QueueType::FrameMark: case QueueType::FrameMarkMsg:
ProcessFrameMark( ev.hdr.id ); ProcessFrameMark( ev.hdr.id );
break; break;
case QueueType::SourceLocation: case QueueType::SourceLocation: