diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-11-04 13:38:30 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-11-04 13:38:30 +0100 |
| commit | 48b914810291f405fd5ba8e9db9dfab3ccaf906c (patch) | |
| tree | df51d615805d20fd43cb66e58d7123abce90a225 /nxcomp | |
| parent | 6cd4f12322ffccdbbfa10ce9e282e54a932b995c (diff) | |
| parent | 252b86ee23cf110e7aef2c3605c5be7ff1cd5a69 (diff) | |
| download | nx-libs-48b914810291f405fd5ba8e9db9dfab3ccaf906c.tar.gz nx-libs-48b914810291f405fd5ba8e9db9dfab3ccaf906c.tar.bz2 nx-libs-48b914810291f405fd5ba8e9db9dfab3ccaf906c.zip | |
Merge branch 'uli42-pr/various5' into 3.6.x
Attributes GH PR #963: https://github.com/ArcticaProject/nx-libs/pull/963
Diffstat (limited to 'nxcomp')
| -rw-r--r-- | nxcomp/src/Channel.h | 8 | ||||
| -rw-r--r-- | nxcomp/src/Log.h | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/nxcomp/src/Channel.h b/nxcomp/src/Channel.h index 7e432416a..3b37fa60d 100644 --- a/nxcomp/src/Channel.h +++ b/nxcomp/src/Channel.h @@ -365,18 +365,18 @@ class Channel int handleEncodeIdentity(EncodeBuffer &encodeBuffer, ChannelCache *channelCache, MessageStore *store, const unsigned char *buffer, - const unsigned int size, int bigEndian) + const unsigned int size, int _bigEndian) { return (store -> encodeIdentity(encodeBuffer, buffer, size, - bigEndian, channelCache)); + _bigEndian, channelCache)); } int handleDecodeIdentity(DecodeBuffer &decodeBuffer, ChannelCache *channelCache, MessageStore *store, unsigned char *&buffer, - unsigned int &size, int bigEndian, + unsigned int &size, int _bigEndian, WriteBuffer *writeBuffer) { - return (store -> decodeIdentity(decodeBuffer, buffer, size, bigEndian, + return (store -> decodeIdentity(decodeBuffer, buffer, size, _bigEndian, writeBuffer, channelCache)); } diff --git a/nxcomp/src/Log.h b/nxcomp/src/Log.h index 95436a55d..52482f5a6 100644 --- a/nxcomp/src/Log.h +++ b/nxcomp/src/Log.h @@ -105,7 +105,7 @@ class NXLogStamp } - NXLogStamp(NXLogLevel level, const char *file = "", const char *function = "", size_t line = 0) : file_(file), function_(function), line_(line), level_(level) + NXLogStamp(NXLogLevel _level, const char *_file = "", const char *_function = "", size_t _line = 0) : file_(_file), function_(_function), line_(_line), level_(_level) { gettimeofday(×tamp_, NULL); } @@ -300,9 +300,9 @@ class NXLog return level_; } - void level(NXLogLevel level) + void level(NXLogLevel _level) { - level_ = level; + level_ = _level; } @@ -312,9 +312,9 @@ class NXLog return get_data()->current_level; } - void current_level(NXLogLevel level) + void current_level(NXLogLevel _level) { - get_data()->current_level = level; + get_data()->current_level = _level; } /** Source file from which messages are currently originating */ @@ -333,10 +333,10 @@ class NXLog return stream_; } - void stream(std::ostream *stream) + void stream(std::ostream *_stream) { flush(); - stream_ = stream; + stream_ = _stream; } bool synchronized() const { |