[Scummvm-cvs-logs] SF.net SVN: scummvm:[34299] scummvm/trunk/sound/flac.cpp

[thebluegr at users.sourceforge.net]

Revision: 34299
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34299&view=rev
Author:   thebluegr
Date:     2008-09-03 10:10:45 +0000 (Wed, 03 Sep 2008)

Log Message:
-----------
Fix for MSVC warning about ambiguous usage of MIN

Modified Paths:
--------------
    scummvm/trunk/sound/flac.cpp

Modified: scummvm/trunk/sound/flac.cpp
===================================================================
--- scummvm/trunk/sound/flac.cpp	2008-09-03 10:00:43 UTC (rev 34298)
+++ scummvm/trunk/sound/flac.cpp	2008-09-03 10:10:45 UTC (rev 34299)
@@ -149,7 +149,7 @@
 	bool isStreamDecoderReady() const { return getStreamDecoderState() == FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC ; }
 
 protected:
-	uint getChannels() const { return MIN(_streaminfo.channels, MAX_OUTPUT_CHANNELS); }
+	uint getChannels() const { return MIN<uint>(_streaminfo.channels, MAX_OUTPUT_CHANNELS); }
 
 	bool allocateBuffer(uint minSamples);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.