Make PartyModeManager.cpp and AddonDatabase.cpp compatible with STL f…

…rom VS2012
Karlson2k · Aug 23, 2012 · bfc080e · bfc080e
1 parent e447838
commit bfc080e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/xbmc/PartyModeManager.cpp b/xbmc/PartyModeManager.cpp
@@ -665,7 +665,7 @@ void CPartyModeManager::AddToHistory(int type, int songID)
 {
   while (m_history.size() >= m_songsInHistory && m_songsInHistory)
     m_history.erase(m_history.begin());
-  m_history.push_back(make_pair<int,int>(type,songID));
+  m_history.push_back(make_pair(type,songID));
 }
 
 void CPartyModeManager::GetRandomSelection(vector< pair<int,int> >& in, unsigned int number, vector< pair<int,int> >& out)

diff --git a/xbmc/addons/AddonDatabase.cpp b/xbmc/addons/AddonDatabase.cpp
@@ -268,7 +268,7 @@ bool CAddonDatabase::GetAddon(int id, AddonPtr& addon)
       m_pDS2->query(sql.c_str());
       while (!m_pDS2->eof())
       {
-        props.dependencies.insert(make_pair(m_pDS2->fv(0).get_asString(), make_pair(m_pDS2->fv(1).get_asString(), m_pDS2->fv(2).get_asBool())));
+        props.dependencies.insert(make_pair(m_pDS2->fv(0).get_asString(), make_pair(AddonVersion(m_pDS2->fv(1).get_asString()), m_pDS2->fv(2).get_asBool())));
         m_pDS2->next();
       }