Merge pull request #984 from ZGCDDoo/shadowed_parameter

Shadowed parameter

Merge pull request #984 from ZGCDDoo/shadowed_parameter
Shadowed parameter
2d96896f · Gabi Melman · GitHub · ac8a7bc1 · 20a0f827 · 2d96896f
Unverified Commit 2d96896f authored Feb 01, 2019 by Gabi Melman Committed by GitHub Feb 01, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

common.h include/spdlog/common.h +4 -4

No files found.
--- a/include/spdlog/common.h
+++ b/include/spdlog/common.h
@@ -210,10 +210,10 @@ struct source_loc
        , funcname{""}
    {
    }
-    SPDLOG_CONSTEXPR source_loc(const char *filename, int line, const char *funcname)
-        : filename{filename}
-        , line{static_cast<uint32_t>(line)}
-        , funcname{funcname}
+    SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in)
+        : filename{filename_in}
+        , line{static_cast<uint32_t>(line_in)}
+        , funcname{funcname_in}
    {
    }