aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2020-11-03 20:41:16 +0100
committerUlrich Sibiller <uli42@gmx.de>2020-11-03 20:52:55 +0100
commite66d2c86beb330d420d8208d28d9da52b7a9dfa3 (patch)
tree5e44b251aa32fabf7ec5a60ca96ed00430bf28e8
parent2c66355c229bd10ad9f0c34e9ea31ed50c715955 (diff)
downloadnx-libs-e66d2c86beb330d420d8208d28d9da52b7a9dfa3.tar.gz
nx-libs-e66d2c86beb330d420d8208d28d9da52b7a9dfa3.tar.bz2
nx-libs-e66d2c86beb330d420d8208d28d9da52b7a9dfa3.zip
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
-rw-r--r--nxcomp/src/Log.h14
1 files 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(&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 {