From ef8c2804584dc44b211baca273c5283101e71722 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 --- exml/debug.cpp | 2 +- exml/debug.h | 4 ++-- test/main.cpp | 16 ++++++++-------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/exml/debug.cpp b/exml/debug.cpp index 02c6da7..1dd8f21 100644 --- a/exml/debug.cpp +++ b/exml/debug.cpp @@ -9,7 +9,7 @@ #include int32_t exml::getLogId() { - static int32_t g_val = etk::log::registerInstance("exml"); + static int32_t g_val = elog::registerInstance("exml"); return g_val; } diff --git a/exml/debug.h b/exml/debug.h index d23947a..e9764ce 100644 --- a/exml/debug.h +++ b/exml/debug.h @@ -7,12 +7,12 @@ */ #pragma once -#include +#include namespace exml { int32_t getLogId(); }; -#define EXML_BASE(info,data) TK_LOG_BASE(exml::getLogId(),info,data) +#define EXML_BASE(info,data) ELOG_BASE(exml::getLogId(),info,data) #define EXML_CRITICAL(data) EXML_BASE(1, data) #define EXML_ERROR(data) EXML_BASE(2, data) diff --git a/test/main.cpp b/test/main.cpp index 9d78574..02e0615 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -24,23 +24,23 @@ int main(int argc, const char *argv[]) { // init Google test : ::testing::InitGoogleTest(&argc, const_cast(argv)); // the only one init for etk: - etk::log::setLevel(etk::log::logLevelNone); + elog::setLevel(elog::logLevelNone); for (int32_t iii=0; iii