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

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

Revision: 5107
          http://sourceforge.net/p/modplug/code/5107
Author:   manxorist
Date:     2015-05-15 13:23:25 +0000 (Fri, 15 May 2015)
Log Message:
-----------
[Ref] Silence some more VS2015 warnings.

Modified Paths:
--------------
    trunk/OpenMPT/common/version.cpp
    trunk/OpenMPT/common/version.h
    trunk/OpenMPT/soundlib/Dither.h

Modified: trunk/OpenMPT/common/version.cpp
===================================================================
--- trunk/OpenMPT/common/version.cpp	2015-05-15 13:14:50 UTC (rev 5106)
+++ trunk/OpenMPT/common/version.cpp	2015-05-15 13:23:25 UTC (rev 5107)
@@ -80,19 +80,19 @@
 	}
 }
 
-VersionNum RemoveBuildNumber(const VersionNum num)
+VersionNum RemoveBuildNumber(const VersionNum num_)
 {
-	return (num & 0xFFFFFF00);
+	return (num_ & 0xFFFFFF00);
 }
 
-bool IsTestBuild(const VersionNum num)
+bool IsTestBuild(const VersionNum num_)
 {
 	return (
 			// Legacy
-			(num > MAKE_VERSION_NUMERIC(1,17,02,54) && num < MAKE_VERSION_NUMERIC(1,18,02,00) && num != MAKE_VERSION_NUMERIC(1,18,00,00))
+			(num_ > MAKE_VERSION_NUMERIC(1,17,02,54) && num_ < MAKE_VERSION_NUMERIC(1,18,02,00) && num_ != MAKE_VERSION_NUMERIC(1,18,00,00))
 		||
 			// Test builds have non-zero VER_MINORMINOR
-			(num > MAKE_VERSION_NUMERIC(1,18,02,00) && RemoveBuildNumber(num) != num)
+			(num_ > MAKE_VERSION_NUMERIC(1,18,02,00) && RemoveBuildNumber(num) != num_)
 		);
 }
 

Modified: trunk/OpenMPT/common/version.h
===================================================================
--- trunk/OpenMPT/common/version.h	2015-05-15 13:14:50 UTC (rev 5106)
+++ trunk/OpenMPT/common/version.h	2015-05-15 13:23:25 UTC (rev 5107)
@@ -43,10 +43,10 @@
 	// Return a version without build number (the last number in the version).
 	// The current versioning scheme uses this number only for test builds, and it should be 00 for official builds,
 	// So sometimes it might be wanted to do comparisons without the build number.
-	VersionNum RemoveBuildNumber(const VersionNum num);
+	VersionNum RemoveBuildNumber(const VersionNum num_);
 
 	// Returns true if a given version number is from a test build, false if it's a release build.
-	bool IsTestBuild(const VersionNum num = MptVersion::num);
+	bool IsTestBuild(const VersionNum num_ = MptVersion::num);
 
 	// Return true if this is a debug build with no optimizations
 	bool IsDebugBuild();

Modified: trunk/OpenMPT/soundlib/Dither.h
===================================================================
--- trunk/OpenMPT/soundlib/Dither.h	2015-05-15 13:14:50 UTC (rev 5106)
+++ trunk/OpenMPT/soundlib/Dither.h	2015-05-15 13:23:25 UTC (rev 5107)
@@ -61,7 +61,7 @@
 	DitherMode mode;
 public:
 	Dither();
-	void SetMode(DitherMode mode);
+	void SetMode(DitherMode mode_);
 	DitherMode GetMode() const;
 	void Reset();
 	void Process(int *mixbuffer, std::size_t count, std::size_t channels, int bits);

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