0
0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-27 00:31:02 +08:00

Move colors enumenator to main header

This commit is contained in:
Sergey Yagovtsev 2016-03-03 15:48:00 +03:00
parent 9fa0b890d8
commit 309da55899
3 changed files with 15 additions and 23 deletions

View File

@ -1,20 +0,0 @@
#ifndef ____PROFILER_____COLOR_____H_____
#define ____PROFILER_____COLOR_____H_____
#include <stdint.h>
namespace profiler{
typedef uint16_t color_t; //16-bit RGB format (5-6-5)
namespace colors{
const color_t Red = 0xF800;
const color_t Green = 0x07E0;
const color_t Blue = 0x001F;
const color_t White = 0xFFFF;
const color_t Black = 0x0000;
}
}
#endif

View File

@ -174,6 +174,19 @@ void foo()
namespace profiler
{
typedef uint16_t color_t; //16-bit RGB format (5-6-5)
namespace colors{
const color_t Red = 0xF800;
const color_t Green = 0x07E0;
const color_t Blue = 0x001F;
const color_t White = 0xFFFF;
const color_t Black = 0x0000;
}
class Block;
extern "C"{
@ -185,10 +198,10 @@ namespace profiler
typedef uint8_t block_type_t;
typedef uint64_t timestamp_t;
typedef uint32_t thread_id_t;
const block_type_t BLOCK_TYPE_EVENT = 1;
const block_type_t BLOCK_TYPE_BLOCK = 2;
#pragma pack(push,1)
class PROFILER_API BaseBlockData
{

View File

@ -9,7 +9,6 @@ set(H_FILES
${ROOT}/include/profiler/profiler.h
profile_manager.h
spin_lock.h
${ROOT}/include/profiler/color.h
)
set(SOURCES