From a9355a5168f88b3f3a68cd25b2b827851c089110 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 8 Mar 2016 21:29:34 +0100 Subject: [PATCH] [DEV] update of external of elog and ethread --- ege/debug.cpp | 2 +- ege/debug.h | 4 ++-- sample/CameraPosition/appl/debug.cpp | 2 +- sample/CameraPosition/appl/debug.h | 6 +++--- sample/Collision/appl/debug.cpp | 2 +- sample/Collision/appl/debug.h | 6 +++--- sample/DoubleView/appl/debug.cpp | 2 +- sample/DoubleView/appl/debug.h | 6 +++--- sample/MeshCreator/appl/debug.cpp | 2 +- sample/MeshCreator/appl/debug.h | 6 +++--- sample/RayTest/appl/debug.cpp | 2 +- sample/RayTest/appl/debug.h | 6 +++--- 12 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ege/debug.cpp b/ege/debug.cpp index a21a9bf..8eeca56 100644 --- a/ege/debug.cpp +++ b/ege/debug.cpp @@ -9,7 +9,7 @@ #include int32_t ege::getLogId() { - static int32_t g_val = etk::log::registerInstance("ege"); + static int32_t g_val = elog::registerInstance("ege"); return g_val; } diff --git a/ege/debug.h b/ege/debug.h index 620a23d..95ba113 100644 --- a/ege/debug.h +++ b/ege/debug.h @@ -7,12 +7,12 @@ */ #pragma once -#include +#include namespace ege { int32_t getLogId(); }; -#define EGE_BASE(info,data) TK_LOG_BASE(ege::getLogId(),info,data) +#define EGE_BASE(info,data) ELOG_BASE(ege::getLogId(),info,data) #define EGE_CRITICAL(data) EGE_BASE(1, data) #define EGE_ERROR(data) EGE_BASE(2, data) diff --git a/sample/CameraPosition/appl/debug.cpp b/sample/CameraPosition/appl/debug.cpp index 07299b6..283ee11 100644 --- a/sample/CameraPosition/appl/debug.cpp +++ b/sample/CameraPosition/appl/debug.cpp @@ -10,6 +10,6 @@ #include int32_t appl::getLogId() { - static int32_t g_val = etk::log::registerInstance("GP-spaceShip"); + static int32_t g_val = elog::registerInstance("GP-spaceShip"); return g_val; } diff --git a/sample/CameraPosition/appl/debug.h b/sample/CameraPosition/appl/debug.h index f22e251..f8a0555 100644 --- a/sample/CameraPosition/appl/debug.h +++ b/sample/CameraPosition/appl/debug.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); @@ -15,11 +15,11 @@ namespace appl { // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define APPL_BASE(info,data) \ do { \ - if (info <= etk::log::getLevel(appl::getLogId())) { \ + if (info <= elog::getLevel(appl::getLogId())) { \ std::stringbuf sb; \ std::ostream tmpStream(&sb); \ tmpStream << data; \ - etk::log::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ + elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ } \ } while(0) diff --git a/sample/Collision/appl/debug.cpp b/sample/Collision/appl/debug.cpp index 07299b6..283ee11 100644 --- a/sample/Collision/appl/debug.cpp +++ b/sample/Collision/appl/debug.cpp @@ -10,6 +10,6 @@ #include int32_t appl::getLogId() { - static int32_t g_val = etk::log::registerInstance("GP-spaceShip"); + static int32_t g_val = elog::registerInstance("GP-spaceShip"); return g_val; } diff --git a/sample/Collision/appl/debug.h b/sample/Collision/appl/debug.h index f22e251..f8a0555 100644 --- a/sample/Collision/appl/debug.h +++ b/sample/Collision/appl/debug.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); @@ -15,11 +15,11 @@ namespace appl { // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define APPL_BASE(info,data) \ do { \ - if (info <= etk::log::getLevel(appl::getLogId())) { \ + if (info <= elog::getLevel(appl::getLogId())) { \ std::stringbuf sb; \ std::ostream tmpStream(&sb); \ tmpStream << data; \ - etk::log::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ + elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ } \ } while(0) diff --git a/sample/DoubleView/appl/debug.cpp b/sample/DoubleView/appl/debug.cpp index 07299b6..283ee11 100644 --- a/sample/DoubleView/appl/debug.cpp +++ b/sample/DoubleView/appl/debug.cpp @@ -10,6 +10,6 @@ #include int32_t appl::getLogId() { - static int32_t g_val = etk::log::registerInstance("GP-spaceShip"); + static int32_t g_val = elog::registerInstance("GP-spaceShip"); return g_val; } diff --git a/sample/DoubleView/appl/debug.h b/sample/DoubleView/appl/debug.h index f22e251..f8a0555 100644 --- a/sample/DoubleView/appl/debug.h +++ b/sample/DoubleView/appl/debug.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); @@ -15,11 +15,11 @@ namespace appl { // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define APPL_BASE(info,data) \ do { \ - if (info <= etk::log::getLevel(appl::getLogId())) { \ + if (info <= elog::getLevel(appl::getLogId())) { \ std::stringbuf sb; \ std::ostream tmpStream(&sb); \ tmpStream << data; \ - etk::log::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ + elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ } \ } while(0) diff --git a/sample/MeshCreator/appl/debug.cpp b/sample/MeshCreator/appl/debug.cpp index 07299b6..283ee11 100644 --- a/sample/MeshCreator/appl/debug.cpp +++ b/sample/MeshCreator/appl/debug.cpp @@ -10,6 +10,6 @@ #include int32_t appl::getLogId() { - static int32_t g_val = etk::log::registerInstance("GP-spaceShip"); + static int32_t g_val = elog::registerInstance("GP-spaceShip"); return g_val; } diff --git a/sample/MeshCreator/appl/debug.h b/sample/MeshCreator/appl/debug.h index f22e251..f8a0555 100644 --- a/sample/MeshCreator/appl/debug.h +++ b/sample/MeshCreator/appl/debug.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); @@ -15,11 +15,11 @@ namespace appl { // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define APPL_BASE(info,data) \ do { \ - if (info <= etk::log::getLevel(appl::getLogId())) { \ + if (info <= elog::getLevel(appl::getLogId())) { \ std::stringbuf sb; \ std::ostream tmpStream(&sb); \ tmpStream << data; \ - etk::log::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ + elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ } \ } while(0) diff --git a/sample/RayTest/appl/debug.cpp b/sample/RayTest/appl/debug.cpp index 07299b6..283ee11 100644 --- a/sample/RayTest/appl/debug.cpp +++ b/sample/RayTest/appl/debug.cpp @@ -10,6 +10,6 @@ #include int32_t appl::getLogId() { - static int32_t g_val = etk::log::registerInstance("GP-spaceShip"); + static int32_t g_val = elog::registerInstance("GP-spaceShip"); return g_val; } diff --git a/sample/RayTest/appl/debug.h b/sample/RayTest/appl/debug.h index f22e251..f8a0555 100644 --- a/sample/RayTest/appl/debug.h +++ b/sample/RayTest/appl/debug.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace appl { int32_t getLogId(); @@ -15,11 +15,11 @@ namespace appl { // TODO : Review this problem of multiple intanciation of "std::stringbuf sb" #define APPL_BASE(info,data) \ do { \ - if (info <= etk::log::getLevel(appl::getLogId())) { \ + if (info <= elog::getLevel(appl::getLogId())) { \ std::stringbuf sb; \ std::ostream tmpStream(&sb); \ tmpStream << data; \ - etk::log::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ + elog::logStream(appl::getLogId(), info, __LINE__, __class__, __func__, tmpStream); \ } \ } while(0)