Merge branch 'uli42-pr/various5' into 3.6.x

Attributes GH PR #963: https://github.com/ArcticaProject/nx-libs/pull/963

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(&timestamp_, 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 {