Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Commit

Permalink
changed: expand std namespace
Browse files Browse the repository at this point in the history 
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@29223 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
  • Loading branch information
spiff_ committed Apr 13, 2010
1 parent 4e5b98a commit 88e9b6f
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions xbmc/addons/AddonManager.cpp
View file
Expand Up @@ -42,6 +42,8 @@
//#endif //#endif




using namespace std;

namespace ADDON namespace ADDON
{ {


Expand All @@ -52,7 +54,7 @@ namespace ADDON
*/ */


CAddonMgr* CAddonMgr::m_pInstance = NULL; CAddonMgr* CAddonMgr::m_pInstance = NULL;
std::map<TYPE, IAddonMgrCallback*> CAddonMgr::m_managers; map<TYPE, IAddonMgrCallback*> CAddonMgr::m_managers;


CAddonMgr::CAddonMgr() CAddonMgr::CAddonMgr()
{ {
Expand Down Expand Up @@ -290,7 +292,7 @@ void CAddonMgr::FindAddons()
else else
{ {
m_addons[addon->Type()].push_back(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));
} }
} }
} }
Expand All @@ -303,7 +305,7 @@ void CAddonMgr::FindAddons()
if (!UpdateIfKnown(addon)) if (!UpdateIfKnown(addon))
{ {
m_addons[addon->Type()].push_back(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));
} }
} }
} }
Expand All @@ -323,7 +325,7 @@ bool CAddonMgr::UpdateIfKnown(AddonPtr &addon)
m_addons[addon->Type()][i] = addon; m_addons[addon->Type()][i] = addon;
CStdString id = addon->ID(); CStdString id = addon->ID();
m_idMap.erase(id); m_idMap.erase(id);
m_idMap.insert(std::make_pair(addon->ID(), addon)); m_idMap.insert(make_pair(addon->ID(), addon));
return true; return true;
} }
} }
Expand Down Expand Up @@ -486,7 +488,7 @@ bool CAddonMgr::AddonFromInfoXML(const TiXmlElement *rootElement,
} }


bool all(false); bool all(false);
std::set<CStdString> platforms; set<CStdString> platforms;
do do
{ {
CStdString platform = element->GetText(); CStdString platform = element->GetText();
Expand Down Expand Up @@ -552,7 +554,7 @@ bool CAddonMgr::AddonFromInfoXML(const TiXmlElement *rootElement,
return false; return false;
} }


std::set<CONTENT_TYPE> contents; set<CONTENT_TYPE> contents;
do do
{ {
CONTENT_TYPE content = TranslateContent(element->GetText()); CONTENT_TYPE content = TranslateContent(element->GetText());
Expand Down Expand Up @@ -608,7 +610,7 @@ bool CAddonMgr::AddonFromInfoXML(const TiXmlElement *rootElement,
#endif #endif


/* Retrieve dependencies that this addon requires */ /* 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"); element = rootElement->FirstChildElement("dependencies");
if (element) if (element)
{ {
Expand All @@ -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()); CLog::Log(LOGDEBUG, "ADDON: %s malformed <dependency> element, will ignore this dependency", strPath.c_str());
continue; 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"); element = element->NextSiblingElement("dependency");
} while (element != NULL); } while (element != NULL);
addonProps.dependencies = deps; addonProps.dependencies = deps;
Expand Down

0 comments on commit 88e9b6f

Please sign in to comment.