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

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

Revision: 5323
          http://sourceforge.net/p/modplug/code/5323
Author:   manxorist
Date:     2015-06-16 09:41:58 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
[Ref] Disable MSVC warning C4355 ('this' : used in base member initializer list) globally.

Modified Paths:
--------------
    trunk/OpenMPT/common/BuildSettings.h
    trunk/OpenMPT/mptrack/TuningDialog.cpp
    trunk/OpenMPT/soundlib/Sndfile.cpp

Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h	2015-06-15 17:18:52 UTC (rev 5322)
+++ trunk/OpenMPT/common/BuildSettings.h	2015-06-16 09:41:58 UTC (rev 5323)
@@ -502,13 +502,11 @@
 
 #if MPT_COMPILER_MSVC
 
+#pragma warning(disable:4355) // 'this' : used in base member initializer list
+
 // happens for immutable classes (i.e. classes containing const members)
 #pragma warning(disable:4512) // assignment operator could not be generated
 
-#if MPT_MSVC_BEFORE(2010,0)
-#pragma warning(disable:4355) // 'this' : used in base member initializer list
-#endif
-
 #if MPT_MSVC_AT_LEAST(2012,0) && MPT_MSVC_BEFORE(2013,0)
 #pragma warning(disable:4250) // 'mpt::fstream' : inherits 'std::basic_istream<_Elem,_Traits>::std::basic_istream<_Elem,_Traits>::_Add_vtordisp1' via dominance
 #endif

Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp	2015-06-15 17:18:52 UTC (rev 5322)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp	2015-06-16 09:41:58 UTC (rev 5323)
@@ -46,7 +46,6 @@
 
 
 // CTuningDialog dialog
-#pragma warning(disable : 4355) // "'this' : used in base member initializer list"
 IMPLEMENT_DYNAMIC(CTuningDialog, CDialog)
 CTuningDialog::CTuningDialog(CWnd* pParent, const TUNINGVECTOR& rVec, CTuning* pTun)
 	: CDialog(CTuningDialog::IDD, pParent),
@@ -58,7 +57,6 @@
 	m_TreeItemTuningItemMap(s_notFoundItemTree, s_notFoundItemTuning),
 	m_TreeCtrlTuning(this),
 	m_DoErrorExit(false)
-#pragma warning(default : 4355) // "'this' : used in base member initializer list"
 //----------------------------------------
 {
 	m_pActiveTuning = pTun;

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2015-06-15 17:18:52 UTC (rev 5322)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2015-06-16 09:41:58 UTC (rev 5323)
@@ -70,9 +70,6 @@
 CTuningCollection* CSoundFile::s_pTuningsSharedLocal(0);
 #endif
 
-#if MPT_COMPILER_MSVC
-#pragma warning(disable : 4355) // "'this' : used in base member initializer list"
-#endif
 CSoundFile::CSoundFile() :
 	m_pTuningsTuneSpecific(nullptr),
 	m_pModSpecs(&ModSpecs::itEx),
@@ -84,9 +81,6 @@
 #endif
 	visitedSongRows(*this),
 	m_pCustomLog(nullptr)
-#if MPT_COMPILER_MSVC
-#pragma warning(default : 4355) // "'this' : used in base member initializer list"
-#endif
 //----------------------
 {
 	MemsetZero(MixSoundBuffer);

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