From 799e62630fa38d7392a3b6402fa0f8b3831fe52d Mon Sep 17 00:00:00 2001 From: sbh Date: Tue, 25 Nov 2014 14:01:47 +0300 Subject: [PATCH] Small corrections to remove compilation warnings --- src/Config/Config_ModuleReader.cpp | 14 +++++++------- src/Events/Events_Loop.cpp | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp index 83b16f27d..57f220e4c 100644 --- a/src/Config/Config_ModuleReader.cpp +++ b/src/Config/Config_ModuleReader.cpp @@ -96,16 +96,16 @@ std::string Config_ModuleReader::addPlugin(const std::string& aPluginLibrary, const std::string& aPluginScript, const std::string& aPluginConf) { - PluginType aType = PluginType::Binary; + PluginType aType = Config_ModuleReader::Binary; std::string aPluginName; if (!aPluginLibrary.empty()) { aPluginName = aPluginLibrary; if (aPluginConf.empty()) { - aType = PluginType::Intrenal; + aType = Config_ModuleReader::Intrenal; } } else if (!aPluginScript.empty()) { aPluginName = aPluginScript; - aType = PluginType::Python; + aType = Config_ModuleReader::Python; } if(!aPluginName.empty()) { myPluginTypes[aPluginName] = aType; @@ -116,16 +116,16 @@ std::string Config_ModuleReader::addPlugin(const std::string& aPluginLibrary, void Config_ModuleReader::loadPlugin(const std::string thePluginName) { - PluginType aType = PluginType::Binary; + PluginType aType = Config_ModuleReader::Binary; if(myPluginTypes.find(thePluginName) != myPluginTypes.end()) { aType = myPluginTypes.at(thePluginName); } switch (aType) { - case PluginType::Python: + case Config_ModuleReader::Python: loadScript(thePluginName); break; - case PluginType::Binary: - case PluginType::Intrenal: + case Config_ModuleReader::Binary: + case Config_ModuleReader::Intrenal: default: loadLibrary(thePluginName); break; diff --git a/src/Events/Events_Loop.cpp b/src/Events/Events_Loop.cpp index f9ccd81ec..d70b9764f 100644 --- a/src/Events/Events_Loop.cpp +++ b/src/Events/Events_Loop.cpp @@ -123,8 +123,9 @@ void Events_Loop::flush(const Events_ID& theID) myGroups.erase(aMyGroup); send(aGroup, false); std::set::iterator anIt = myFlushed.find(theID.myID); - if (anIt != myFlushed.end()) - myFlushed.erase(myFlushed.find(theID.myID)); + if (anIt != myFlushed.end()) { + myFlushed.erase(anIt); + } } } -- 2.39.2