From 12b90d1630b1dd13d07ebb8b17bfeffd86827580 Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Sun, 29 Jul 2018 14:20:44 +0200 Subject: [PATCH] Move tracy version to a separate header. --- server/TracyVersion.hpp | 14 ++++++++++++++ server/TracyWorker.cpp | 5 +++-- standalone/build/win32/Tracy.vcxproj | 1 + standalone/build/win32/Tracy.vcxproj.filters | 3 +++ 4 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 server/TracyVersion.hpp diff --git a/server/TracyVersion.hpp b/server/TracyVersion.hpp new file mode 100644 index 00000000..0892686b --- /dev/null +++ b/server/TracyVersion.hpp @@ -0,0 +1,14 @@ +#ifndef __TRACYVERSION_HPP__ +#define __TRACYVERSION_HPP__ + +namespace tracy +{ +namespace Version +{ +enum { Major = 0 }; +enum { Minor = 3 }; +enum { Patch = 200 }; +} +} + +#endif diff --git a/server/TracyWorker.cpp b/server/TracyWorker.cpp index 04583ca3..c8a20962 100644 --- a/server/TracyWorker.cpp +++ b/server/TracyWorker.cpp @@ -26,6 +26,7 @@ #include "../common/TracySystem.hpp" #include "TracyFileRead.hpp" #include "TracyFileWrite.hpp" +#include "TracyVersion.hpp" #include "TracyWorker.hpp" #include "tracy_flat_hash_map.hpp" @@ -38,9 +39,9 @@ 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', 0, 3, 200 }; +static const uint8_t FileHeader[8] { 't', 'r', 'a', 'c', 'y', Version::Major, Version::Minor, Version::Patch }; enum { FileHeaderMagic = 5 }; -static const int CurrentVersion = FileVersion( FileHeader[FileHeaderMagic], FileHeader[FileHeaderMagic+1], FileHeader[FileHeaderMagic+2] ); +static const int CurrentVersion = FileVersion( Version::Major, Version::Minor, Version::Patch ); static void UpdateLockCountLockable( LockMap& lockmap, size_t pos ) diff --git a/standalone/build/win32/Tracy.vcxproj b/standalone/build/win32/Tracy.vcxproj index ced6fb86..fd2651ad 100644 --- a/standalone/build/win32/Tracy.vcxproj +++ b/standalone/build/win32/Tracy.vcxproj @@ -141,6 +141,7 @@ + diff --git a/standalone/build/win32/Tracy.vcxproj.filters b/standalone/build/win32/Tracy.vcxproj.filters index 1792ef13..39b02feb 100644 --- a/standalone/build/win32/Tracy.vcxproj.filters +++ b/standalone/build/win32/Tracy.vcxproj.filters @@ -185,6 +185,9 @@ src + + server +