diff options
-rw-r--r-- | AudioManagerUtilities/CMakeLists.txt | 10 | ||||
-rw-r--r-- | AudioManagerUtilities/include/CAmDltWrapper.h | 7 |
2 files changed, 4 insertions, 13 deletions
diff --git a/AudioManagerUtilities/CMakeLists.txt b/AudioManagerUtilities/CMakeLists.txt index 5933e4b..6e9a06f 100644 --- a/AudioManagerUtilities/CMakeLists.txt +++ b/AudioManagerUtilities/CMakeLists.txt @@ -109,16 +109,6 @@ IF (WITH_DLT) add_definitions(${DLT_CFLAGS_OTHER}) - set (DLT_VERSIONING ${DLT_VERSION}) - string (REPLACE "." ";" DLT_VERSIONING ${DLT_VERSIONING}) - list (LENGTH DLT_VERSIONING size) - - if (size GREATER "1") - list (GET DLT_VERSIONING 0 DLT_MAJOR_VERSION) - list (GET DLT_VERSIONING 1 DLT_MINOR_VERSION) - add_definitions (-DDLT_MAJOR_VERSION=${DLT_MAJOR_VERSION} -DDLT_MINOR_VERSION=${DLT_MINOR_VERSION}) - endif (size GREATER "1") - set(AUDIO_MANAGER_UTILITIES_LIBS ${AUDIO_MANAGER_UTILITIES_LIBS} ${DLT_LIBRARIES} diff --git a/AudioManagerUtilities/include/CAmDltWrapper.h b/AudioManagerUtilities/include/CAmDltWrapper.h index a37ec77..8c5678e 100644 --- a/AudioManagerUtilities/include/CAmDltWrapper.h +++ b/AudioManagerUtilities/include/CAmDltWrapper.h @@ -161,10 +161,11 @@ public: bool checkLogLevel(DltLogLevelType logLevel) { #ifdef WITH_DLT - #if (DLT_MAJOR_VERSION >= 2 && DLT_MINOR_VERSION >= 16) - return (1 == dlt_user_is_logLevel_enabled(&mDltContext,logLevel)? true: false); + #ifdef DLT_IS_LOG_LEVEL_ENABLED + return (dlt_user_is_logLevel_enabled(&mDltContext, logLevel) == DLT_RETURN_TRUE); #else - return false; + (void)logLevel; + return true; #endif #else return (logLevel <= mDltContext.log_level_user); |