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

Log.h: fix some shadow warnings
e66d2c86 · Ulrich Sibiller · 2c66355c · e66d2c86
Commit e66d2c86 authored Nov 03, 2020 by Ulrich Sibiller
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

Log.h nxcomp/src/Log.h +7 -7

No files found.
--- 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 {