[OMPT-svn-commit] SF.net SVN: modplug:[4204] trunk/OpenMPT

[<man...@us...>]

Revision: 4204
          http://sourceforge.net/p/modplug/code/4204
Author:   manxorist
Date:     2014-08-10 07:44:19 +0000 (Sun, 10 Aug 2014)
Log Message:
-----------
[Ref] Fix some GCC -pedantic warnings.

Modified Paths:
--------------
    trunk/OpenMPT/common/mptString.cpp
    trunk/OpenMPT/libopenmpt/libopenmpt_modplug_cpp.cpp
    trunk/OpenMPT/soundlib/MixerInterface.h

Modified: trunk/OpenMPT/common/mptString.cpp
===================================================================
--- trunk/OpenMPT/common/mptString.cpp	2014-08-07 13:42:14 UTC (rev 4203)
+++ trunk/OpenMPT/common/mptString.cpp	2014-08-10 07:44:19 UTC (rev 4204)
@@ -938,9 +938,9 @@
 					outbuf[i] = 0;
 				}
 				#ifdef MPT_PLATFORM_BIG_ENDIAN
-					outbuf[sizeof(wchar_t)-1 - 1] = 0xff; outbuf[sizeof(wchar_t)-1 - 0] = 0xfd;
+					outbuf[sizeof(wchar_t)-1 - 1] = uint8(0xff); outbuf[sizeof(wchar_t)-1 - 0] = uint8(0xfd);
 				#else
-					outbuf[1] = 0xff; outbuf[0] = 0xfd;
+					outbuf[1] = uint8(0xff); outbuf[0] = uint8(0xfd);
 				#endif
 				outbuf += sizeof(wchar_t);
 				outbytesleft -= sizeof(wchar_t);
@@ -1181,12 +1181,12 @@
 
 #if defined(MPT_WITH_CHARSET_LOCALE)
 std::string ToString(const std::wstring & x) { return mpt::ToLocale(x); }
-std::string ToString(const wchar_t * const & x) { return mpt::ToLocale(x); };
+std::string ToString(const wchar_t * const & x) { return mpt::ToLocale(x); }
 std::string ToString(const char & x) { return std::string(1, x); }
 std::string ToString(const wchar_t & x) { return mpt::ToLocale(std::wstring(1, x)); }
 #else
 std::string ToString(const std::wstring & x) { return mpt::To(mpt::CharsetUTF8, x); }
-std::string ToString(const wchar_t * const & x) { return mpt::To(mpt::CharsetUTF8, x); };
+std::string ToString(const wchar_t * const & x) { return mpt::To(mpt::CharsetUTF8, x); }
 std::string ToString(const char & x) { return std::string(1, x); }
 std::string ToString(const wchar_t & x) { return mpt::To(mpt::CharsetUTF8, std::wstring(1, x)); }
 #endif

Modified: trunk/OpenMPT/libopenmpt/libopenmpt_modplug_cpp.cpp
===================================================================
--- trunk/OpenMPT/libopenmpt/libopenmpt_modplug_cpp.cpp	2014-08-07 13:42:14 UTC (rev 4203)
+++ trunk/OpenMPT/libopenmpt/libopenmpt_modplug_cpp.cpp	2014-08-10 07:44:19 UTC (rev 4204)
@@ -110,7 +110,7 @@
 UINT CSoundFile::gnAGC = 0;
 UINT CSoundFile::gnVolumeRampSamples = 0;
 UINT CSoundFile::gnVUMeter = 0;
-UINT CSoundFile::gnCPUUsage = 0;;
+UINT CSoundFile::gnCPUUsage = 0;
 LPSNDMIXHOOKPROC CSoundFile::gpSndMixHook = 0;
 PMIXPLUGINCREATEPROC CSoundFile::gpMixPluginCreateProc = 0;
 

Modified: trunk/OpenMPT/soundlib/MixerInterface.h
===================================================================
--- trunk/OpenMPT/soundlib/MixerInterface.h	2014-08-07 13:42:14 UTC (rev 4203)
+++ trunk/OpenMPT/soundlib/MixerInterface.h	2014-08-10 07:44:19 UTC (rev 4204)
@@ -99,7 +99,7 @@
 
 	c.nPos += smpPos >> 16;
 	c.nPosLo = smpPos & 0xFFFF;
-};
+}
 
 // Type of the SampleLoop function above
 typedef void (*MixFuncInterface)(ModChannel &, const CResampler &, mixsample_t *, int);

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