diff options
| author | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-01 19:20:57 +0100 |
|---|---|---|
| committer | christian mueller <christian.ei.mueller@bmw.de> | 2012-03-01 19:20:57 +0100 |
| commit | dda6516c5406e08f9e2dec391e075d5f2e075e6d (patch) | |
| tree | 7cf11b7496a7a83478fcd5a097c45d462ddf6da1 /include | |
| parent | dfcafbec34e0e454d9995551998af5d40a27c7ad (diff) | |
| download | audiomanager-dda6516c5406e08f9e2dec391e075d5f2e075e6d.tar.gz | |
* solved merge conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/shared/CAmDltWrapper.h | 8 |
1 files changed, 3 insertions, 5 deletions
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 <stdint.h> +#include <sstream> 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 <string> |