Move FileVersion() to TracyFileHeader.hpp.

This commit is contained in:
Bartosz Taudul 2019-08-19 22:55:37 +02:00
parent 9d87a8394d
commit 94382f54ca
2 changed files with 7 additions and 5 deletions

View File

@ -1,11 +1,18 @@
#ifndef __TRACYFILEHEADER_HPP__ #ifndef __TRACYFILEHEADER_HPP__
#define __TRACYFILEHEADER_HPP__ #define __TRACYFILEHEADER_HPP__
#include "../common/TracyForceInline.hpp"
namespace tracy namespace tracy
{ {
static const char Lz4Header[4] = { 't', 'l', 'Z', 4 }; static const char Lz4Header[4] = { 't', 'l', 'Z', 4 };
static constexpr tracy_force_inline int FileVersion( uint8_t h5, uint8_t h6, uint8_t h7 )
{
return ( h5 << 16 ) | ( h6 << 8 ) | h7;
}
} }
#endif #endif

View File

@ -53,11 +53,6 @@ static inline CallstackFrameId PackPointer( uint64_t ptr )
return id; return id;
} }
static constexpr int FileVersion( uint8_t h5, uint8_t h6, uint8_t h7 )
{
return ( h5 << 16 ) | ( h6 << 8 ) | h7;
}
static const uint8_t FileHeader[8] { 't', 'r', 'a', 'c', 'y', Version::Major, Version::Minor, Version::Patch }; static const uint8_t FileHeader[8] { 't', 'r', 'a', 'c', 'y', Version::Major, Version::Minor, Version::Patch };
enum { FileHeaderMagic = 5 }; enum { FileHeaderMagic = 5 };
static const int CurrentVersion = FileVersion( Version::Major, Version::Minor, Version::Patch ); static const int CurrentVersion = FileVersion( Version::Major, Version::Minor, Version::Patch );