Merge pull request #2647 from Karlson2k/C++11_compat_01

Improve compatibility with C++11 (Visual Studio 2012, Intel Compiler 13.0)

diff --cc xbmc/epg/Epg.cpp
Simple merge

diff --cc xbmc/pvr/PVRManager.cpp
index 2fb5de9,1d09f29..e484224
--- 1/xbmc/pvr/PVRManager.cpp
--- 2/xbmc/pvr/PVRManager.cpp
+++ b/xbmc/pvr/PVRManager.cpp
@@@ -193,10 -115,10 +193,10 @@@ bool CPVRManager::InstallAddonAllowed(c
  
  void CPVRManager::MarkAsOutdated(const std::string& strAddonId, const std::string& strReferer)
  {
 -  if (IsStarted() && g_guiSettings.GetBool("general.addonautoupdate"))
 +  if (IsStarted() && CSettings::Get().GetBool("general.addonautoupdate"))
    {
      CSingleLock lock(m_critSection);
-     m_outdatedAddons.insert(make_pair<string, string>(strAddonId, strReferer));
+     m_outdatedAddons.insert(make_pair(strAddonId, strReferer));
    }
  }