Commit e66d2c86 authored by Ulrich Sibiller's avatar Ulrich Sibiller

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
parent 2c66355c
...@@ -105,7 +105,7 @@ class NXLogStamp ...@@ -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); gettimeofday(&timestamp_, NULL);
} }
...@@ -300,9 +300,9 @@ class NXLog ...@@ -300,9 +300,9 @@ class NXLog
return level_; return level_;
} }
void level(NXLogLevel level) void level(NXLogLevel _level)
{ {
level_ = level; level_ = _level;
} }
...@@ -312,9 +312,9 @@ class NXLog ...@@ -312,9 +312,9 @@ class NXLog
return get_data()->current_level; 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 */ /** Source file from which messages are currently originating */
...@@ -333,10 +333,10 @@ class NXLog ...@@ -333,10 +333,10 @@ class NXLog
return stream_; return stream_;
} }
void stream(std::ostream *stream) void stream(std::ostream *_stream)
{ {
flush(); flush();
stream_ = stream; stream_ = _stream;
} }
bool synchronized() const { bool synchronized() const {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment