diff options
author | Ulrich Sibiller <uli42@gmx.de> | 2020-11-03 20:31:11 +0100 |
---|---|---|
committer | Ulrich Sibiller <uli42@gmx.de> | 2020-11-03 20:52:50 +0100 |
commit | 2c66355c229bd10ad9f0c34e9ea31ed50c715955 (patch) | |
tree | f914f851c8eac26c4b04c1a65498525237043f75 | |
parent | 5bd72aec3c45664712c4c88875777e955bb53da3 (diff) | |
download | nx-libs-2c66355c229bd10ad9f0c34e9ea31ed50c715955.tar.gz nx-libs-2c66355c229bd10ad9f0c34e9ea31ed50c715955.tar.bz2 nx-libs-2c66355c229bd10ad9f0c34e9ea31ed50c715955.zip |
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
-rw-r--r-- | nxcomp/src/Channel.h | 8 |
1 files changed, 4 insertions, 4 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)); } |