Skip to content
Browse files

changed: expand std namespace

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29223 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information...
1 parent 4e5b98a commit 88e9b6fdc93074fd90cefcf08055a71b3d986864 spiff_ committed Apr 13, 2010
Showing with 10 additions and 8 deletions.
  1. +10 −8 xbmc/addons/AddonManager.cpp
View
18 xbmc/addons/AddonManager.cpp
@@ -42,6 +42,8 @@
//#endif
+using namespace std;
+
namespace ADDON
{
@@ -52,7 +54,7 @@ namespace ADDON
*/
CAddonMgr* CAddonMgr::m_pInstance = NULL;
-std::map<TYPE, IAddonMgrCallback*> CAddonMgr::m_managers;
+map<TYPE, IAddonMgrCallback*> CAddonMgr::m_managers;
CAddonMgr::CAddonMgr()
{
@@ -290,7 +292,7 @@ void CAddonMgr::FindAddons()
else
{
m_addons[addon->Type()].push_back(addon);
- m_idMap.insert(std::make_pair(addon->ID(), addon));
+ m_idMap.insert(make_pair(addon->ID(), addon));
}
}
}
@@ -303,7 +305,7 @@ void CAddonMgr::FindAddons()
if (!UpdateIfKnown(addon))
{
m_addons[addon->Type()].push_back(addon);
- m_idMap.insert(std::make_pair(addon->ID(), addon));
+ m_idMap.insert(make_pair(addon->ID(), addon));
}
}
}
@@ -323,7 +325,7 @@ bool CAddonMgr::UpdateIfKnown(AddonPtr &addon)
m_addons[addon->Type()][i] = addon;
CStdString id = addon->ID();
m_idMap.erase(id);
- m_idMap.insert(std::make_pair(addon->ID(), addon));
+ m_idMap.insert(make_pair(addon->ID(), addon));
return true;
}
}
@@ -486,7 +488,7 @@ bool CAddonMgr::AddonFromInfoXML(const TiXmlElement *rootElement,
}
bool all(false);
- std::set<CStdString> platforms;
+ set<CStdString> platforms;
do
{
CStdString platform = element->GetText();
@@ -552,7 +554,7 @@ bool CAddonMgr::AddonFromInfoXML(const TiXmlElement *rootElement,
return false;
}
- std::set<CONTENT_TYPE> contents;
+ set<CONTENT_TYPE> contents;
do
{
CONTENT_TYPE content = TranslateContent(element->GetText());
@@ -608,7 +610,7 @@ bool CAddonMgr::AddonFromInfoXML(const TiXmlElement *rootElement,
#endif
/* Retrieve dependencies that this addon requires */
- std::map<CStdString, std::pair<const AddonVersion, const AddonVersion> > deps;
+ map<CStdString, pair<const AddonVersion, const AddonVersion> > deps;
element = rootElement->FirstChildElement("dependencies");
if (element)
{
@@ -627,7 +629,7 @@ bool CAddonMgr::AddonFromInfoXML(const TiXmlElement *rootElement,
CLog::Log(LOGDEBUG, "ADDON: %s malformed <dependency> element, will ignore this dependency", strPath.c_str());
continue;
}
- deps.insert(std::make_pair(id, std::make_pair(AddonVersion(min), AddonVersion(max))));
+ deps.insert(make_pair(id, make_pair(AddonVersion(min), AddonVersion(max))));
element = element->NextSiblingElement("dependency");
} while (element != NULL);
addonProps.dependencies = deps;

0 comments on commit 88e9b6f

Please sign in to comment.
Something went wrong with that request. Please try again.