diff --git a/GaudiPluginService/Gaudi/Details/PluginServiceDetails.h b/GaudiPluginService/Gaudi/Details/PluginServiceDetails.h index f4f031832e6a563d9227963111b105538fd2bc93..67b6d0026097739ec9c18bf07a28c4bb56665788 100644 --- a/GaudiPluginService/Gaudi/Details/PluginServiceDetails.h +++ b/GaudiPluginService/Gaudi/Details/PluginServiceDetails.h @@ -206,10 +206,10 @@ namespace Gaudi { namespace PluginService { class GAUDIPS_API Logger { public: enum Level { Debug=0, Info=1, Warning=2, Error=3 }; - Logger(Level level = Warning): m_level(level) {} + Logger(Level lvl = Warning): m_level(lvl) {} virtual ~Logger() {} inline Level level() const { return m_level; } - inline void setLevel(Level level) { m_level = level; } + inline void setLevel(Level lvl) { m_level = lvl; } inline void info(const std::string& msg) { report(Info, msg); } inline void debug(const std::string& msg) { report(Debug, msg); } inline void warning(const std::string& msg) { report(Warning, msg); } diff --git a/GaudiPluginService/src/PluginService.cpp b/GaudiPluginService/src/PluginService.cpp index b6c779196b0622db6b5f27a1e535e4b77dccd906..4f08f0ce95e70f9a4425757644e96779ad3d6a66 100644 --- a/GaudiPluginService/src/PluginService.cpp +++ b/GaudiPluginService/src/PluginService.cpp @@ -188,27 +188,27 @@ namespace Gaudi { namespace PluginService { } // read the file logger().debug(std::string(" reading ") + name); - std::ifstream factories(fullPath.c_str()); + std::ifstream facts(fullPath.c_str()); std::string line; int factoriesCount = 0; int lineCount = 0; - while (!factories.eof()) { + while (!facts.eof()) { ++lineCount; - std::getline(factories, line); + std::getline(facts, line); trim(line); // skip empty lines and lines starting with '#' if (line.empty() || line[0] == '#') continue; // look for the separator - std::string::size_type pos = line.find(':'); - if (pos == std::string::npos) { + std::string::size_type other_pos = line.find(':'); + if (other_pos == std::string::npos) { std::ostringstream o; o << "failed to parse line " << fullPath << ':' << lineCount; logger().warning(o.str()); continue; } - const std::string lib(line, 0, pos); - const std::string fact(line, pos+1); + const std::string lib(line, 0, other_pos); + const std::string fact(line, other_pos+1); m_factories.insert(std::make_pair(fact, FactoryInfo(lib))); #ifdef GAUDI_REFLEX_COMPONENT_ALIASES // add an alias for the factory using the Reflex convention