From 60bd0a54c1664ea75395c1912087b3b76f344932 Mon Sep 17 00:00:00 2001 From: Vasily Date: Sun, 17 Feb 2019 22:00:48 +0100 Subject: [PATCH] Fix shadowed variable in easylogging++.cc The _var was chosen because it conflicts with the naming convention in the rest of the file. Fixing the error was easier than getting GCC to ignore errors in one file, or using a pragma to mute the warning. Introducing a GCC pragma would require disabling C4068 on MSVC (unknown pragma). --- third-party/easylogging++/easylogging++.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/third-party/easylogging++/easylogging++.cc b/third-party/easylogging++/easylogging++.cc index 04b6492..6e85715 100644 --- a/third-party/easylogging++/easylogging++.cc +++ b/third-party/easylogging++/easylogging++.cc @@ -1789,26 +1789,26 @@ void TypedConfigurations::insertFile(Level level, const std::string& fullFilenam if (filePath.size() < resolvedFilename.size()) { base::utils::File::createPath(filePath); } - auto create = [&](Level level) { + auto create = [&](Level level_var) { base::LogStreamsReferenceMap::iterator filestreamIter = m_logStreamsReference->find(resolvedFilename); base::type::fstream_t* fs = nullptr; if (filestreamIter == m_logStreamsReference->end()) { // We need a completely new stream, nothing to share with fs = base::utils::File::newFileStream(resolvedFilename); - m_filenameMap.insert(std::make_pair(level, resolvedFilename)); - m_fileStreamMap.insert(std::make_pair(level, base::FileStreamPtr(fs))); - m_logStreamsReference->insert(std::make_pair(resolvedFilename, base::FileStreamPtr(m_fileStreamMap.at(level)))); + m_filenameMap.insert(std::make_pair(level_var, resolvedFilename)); + m_fileStreamMap.insert(std::make_pair(level_var, base::FileStreamPtr(fs))); + m_logStreamsReference->insert(std::make_pair(resolvedFilename, base::FileStreamPtr(m_fileStreamMap.at(level_var)))); } else { // Woops! we have an existing one, share it! - m_filenameMap.insert(std::make_pair(level, filestreamIter->first)); - m_fileStreamMap.insert(std::make_pair(level, base::FileStreamPtr(filestreamIter->second))); + m_filenameMap.insert(std::make_pair(level_var, filestreamIter->first)); + m_fileStreamMap.insert(std::make_pair(level_var, base::FileStreamPtr(filestreamIter->second))); fs = filestreamIter->second.get(); } if (fs == nullptr) { // We display bad file error from newFileStream() ELPP_INTERNAL_ERROR("Setting [TO_FILE] of [" - << LevelHelper::convertToString(level) << "] to FALSE", false); - setValue(level, false, &m_toFileMap); + << LevelHelper::convertToString(level_var) << "] to FALSE", false); + setValue(level_var, false, &m_toFileMap); } }; // If we dont have file conf for any level, create it for Level::Global first