Channel.h: rename variable to prevent shadowing

In file included from Proxy.h:39:0, from ServerProxy.h:32, from ServerProxy.cpp:36: Channel.h: In member function 'int Channel::handleEncodeIdentity(EncodeBuffer&, ChannelCache*, MessageStore*, const unsigned char*, unsigned int, int)': Channel.h:369:3: warning: declaration of 'bigEndian' shadows a member of 'this' [-Wshadow] { ^ Channel.h: In member function 'int Channel::handleDecodeIdentity(DecodeBuffer&, ChannelCache*, MessageStore*, unsigned char*&, unsigned int&, int, WriteBuffer*)': Channel.h:378:3: warning: declaration of 'bigEndian' shadows a member of 'this' [-Wshadow] { ^ RHEL7's g++ 4.8.5 reports this while Debian's g++ 10.2.0-15 does not. This is described in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57709 and fixed in gcc 5.0. Rename the variables anyway to be on the safe side. Fixes ArcticaProject/nx-libs#956

Channel.h: rename variable to prevent shadowing
2c66355c · Ulrich Sibiller · 5bd72aec · 2c66355c
Commit 2c66355c authored Nov 03, 2020 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Channel.h nxcomp/src/Channel.h +4 -4

No files found.
--- 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));
  }