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

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

Revision: 5106
          http://sourceforge.net/p/modplug/code/5106
Author:   manxorist
Date:     2015-05-15 13:14:50 +0000 (Fri, 15 May 2015)
Log Message:
-----------
[Ref] Support VS2015 in CompilerDetect.h.
[Ref] Silence class member shadowing warning with VS2015.

Modified Paths:
--------------
    trunk/OpenMPT/common/CompilerDetect.h
    trunk/OpenMPT/mptrack/Settings.h

Modified: trunk/OpenMPT/common/CompilerDetect.h
===================================================================
--- trunk/OpenMPT/common/CompilerDetect.h	2015-05-15 09:00:30 UTC (rev 5105)
+++ trunk/OpenMPT/common/CompilerDetect.h	2015-05-15 13:14:50 UTC (rev 5106)
@@ -47,7 +47,9 @@
 #elif defined(_MSC_VER)
 
 #define MPT_COMPILER_MSVC                            1
-#if (_MSC_VER >= 1800)
+#if (_MSC_VER >= 1900)
+#define MPT_COMPILER_MSVC_VERSION                    MPT_COMPILER_MAKE_VERSION2(2015,0)
+#elif (_MSC_VER >= 1800)
 #define MPT_COMPILER_MSVC_VERSION                    MPT_COMPILER_MAKE_VERSION2(2013,0)
 #elif (_MSC_VER >= 1700)
 #define MPT_COMPILER_MSVC_VERSION                    MPT_COMPILER_MAKE_VERSION2(2012,0)

Modified: trunk/OpenMPT/mptrack/Settings.h
===================================================================
--- trunk/OpenMPT/mptrack/Settings.h	2015-05-15 09:00:30 UTC (rev 5105)
+++ trunk/OpenMPT/mptrack/Settings.h	2015-05-15 13:14:50 UTC (rev 5106)
@@ -472,7 +472,7 @@
 class ISettingChanged
 {
 public:
-	virtual void SettingChanged(const SettingPath &path) = 0;
+	virtual void SettingChanged(const SettingPath &changedPath) = 0;
 };
 
 enum SettingFlushMode
@@ -699,9 +699,9 @@
 		value = conf.Read<T>(path);
 		return *this;
 	}
-	void SettingChanged(const SettingPath &path)
+	void SettingChanged(const SettingPath &changedPath)
 	{
-		MPT_UNREFERENCED_PARAMETER(path);
+		MPT_UNREFERENCED_PARAMETER(changedPath);
 		Update();
 	}
 	template<typename Trhs> CachedSetting & operator += (const Trhs &rhs) { T tmp = *this; tmp += rhs; *this = tmp; return *this; }

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