Permalink
Browse files

Merge remote-tracking branch 'xbmc/Frodo' into frodo

Conflicts:
	project/BuildDependencies/scripts/boost_d.txt
  • Loading branch information...
2 parents f108530 + 99ee1f3 commit 685146d0ed14a04583fea0a3137ef52d9d8a26f5 @tru tru committed Mar 12, 2013
Showing with 5 additions and 3 deletions.
  1. +2 −2 project/BuildDependencies/scripts/boost_d.txt
  2. +3 −1 xbmc/interfaces/legacy/File.h
View
4 project/BuildDependencies/scripts/boost_d.txt
@@ -1,6 +1,6 @@
; filename mirror of the file
-;boost-1_46_1-xbmc-win32-1.7z http://mirrors.xbmc.org/build-deps/win32/
+;boost-1_46_1-xbmc-win32-2.7z http://mirrors.xbmc.org/build-deps/win32/
;boost_1_46_1-headers-win32.7z http://mirrors.xbmc.org/build-deps/win32/
;boost_1_46_1-libs-win32.7z http://mirrors.xbmc.org/build-deps/win32/
;boost_1_46_1-debug-libs-win32.7z http://mirrors.xbmc.org/build-deps/win32/
-boost-plex.7z http://nightlies.plexapp.com/plex-dependencies/laika-depends/windows
+boost-plex.7z http://nightlies.plexapp.com/plex-dependencies/laika-depends/windows
View
4 xbmc/interfaces/legacy/File.h
@@ -27,6 +27,8 @@
#include "LanguageHook.h"
#include "commons/Buffer.h"
+#include <algorithm>
+
namespace XBMCAddon
{
@@ -70,7 +72,7 @@ namespace XBMCAddon
inline String read(unsigned long numBytes = 0)
{
XbmcCommons::Buffer b = readBytes(numBytes);
- return b.getString(numBytes == 0 ? b.remaining() : std::min(b.remaining(),numBytes));
+ return b.getString(numBytes == 0 ? b.remaining() : std::min((unsigned long)b.remaining(),numBytes));
}
/**

0 comments on commit 685146d

Please sign in to comment.