This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.6.x in repository nx-libs. commit e66d2c86beb330d420d8208d28d9da52b7a9dfa3 Author: Ulrich Sibiller <uli42@gmx.de> Date: Tue Nov 3 20:41:16 2020 +0100 Log.h: fix some shadow warnings "warning: declaration of '<something>' shadows a member of 'this' This shows up in gcc 4.8.5 and has been fixed in gcc 5.0, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=57709 Change the variable names anyway to be on the safe side. Fixes ArcticaProject/nx-libs#958 --- nxcomp/src/Log.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git