diff --git a/include/profiler/color.h b/include/profiler/color.h deleted file mode 100644 index b366f08..0000000 --- a/include/profiler/color.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef ____PROFILER_____COLOR_____H_____ -#define ____PROFILER_____COLOR_____H_____ - -#include - -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 \ No newline at end of file diff --git a/include/profiler/profiler.h b/include/profiler/profiler.h index 554ef01..863a801 100644 --- a/include/profiler/profiler.h +++ b/include/profiler/profiler.h @@ -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 { diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 80bd160..5b776a1 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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