From dda6516c5406e08f9e2dec391e075d5f2e075e6d Mon Sep 17 00:00:00 2001 From: christian mueller Date: Thu, 1 Mar 2012 19:20:57 +0100 Subject: * solved merge conflicts --- include/shared/CAmDltWrapper.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/include/shared/CAmDltWrapper.h b/include/shared/CAmDltWrapper.h index ea6f246..0df9cde 100644 --- a/include/shared/CAmDltWrapper.h +++ b/include/shared/CAmDltWrapper.h @@ -24,6 +24,7 @@ #else #include +#include namespace am { @@ -59,8 +60,7 @@ typedef enum typedef struct { DltContext *handle; /**< pointer to DltContext */ - char buffer[DLT_USER_BUF_MAX_SIZE]; /**< buffer for building log message*/ - int32_t size; /**< payload size */ + std::stringstream buffer; /**< buffer for building log message*/ int32_t log_level; /**< log level */ int32_t trace_status; /**< trace status */ int32_t args_num; /**< number of arguments for extended header*/ @@ -75,9 +75,7 @@ DltContext CONTEXT; #define DLT_IMPORT_CONTEXT(CONTEXT) \ extern DltContext CONTEXT; -} - -#endif +#endif // WITH_DLT #include -- cgit v1.2.1