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

[<rel...@us...>]

Revision: 205
          http://modplug.svn.sourceforge.net/modplug/?rev=205&view=rev
Author:   relabsoluness
Date:     2008-03-17 11:11:44 -0700 (Mon, 17 Mar 2008)

Log Message:
-----------
. Internal: fixes to make things work on newer VC compilers.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/TuningDialog.cpp
    trunk/OpenMPT/mptrack/tuningRatioMapWnd.h
    trunk/OpenMPT/soundlib/Sndfile.cpp
    trunk/OpenMPT/soundlib/Sndmix.cpp
    trunk/OpenMPT/soundlib/midi.h
    trunk/OpenMPT/soundlib/tuning.cpp

Modified: trunk/OpenMPT/mptrack/TuningDialog.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TuningDialog.cpp	2008-03-15 12:38:52 UTC (rev 204)
+++ trunk/OpenMPT/mptrack/TuningDialog.cpp	2008-03-17 18:11:44 UTC (rev 205)
@@ -8,8 +8,8 @@
 const CTuningDialog::TUNINGTREEITEM CTuningDialog::s_notFoundItemTuning = TUNINGTREEITEM();
 const HTREEITEM CTuningDialog::s_notFoundItemTree = NULL;
 
-using CTuning::UNOTEINDEXTYPE;
-using CTuning::RATIOTYPE;
+typedef CTuning::UNOTEINDEXTYPE UNOTEINDEXTYPE;
+typedef CTuning::RATIOTYPE RATIOTYPE;
 #define TT_GENERAL CTuning::TT_GENERAL
 #define TT_GROUPGEOMETRIC CTuning::TT_GROUPGEOMETRIC
 #define TT_GEOMETRIC CTuning::TT_GEOMETRIC

Modified: trunk/OpenMPT/mptrack/tuningRatioMapWnd.h
===================================================================
--- trunk/OpenMPT/mptrack/tuningRatioMapWnd.h	2008-03-15 12:38:52 UTC (rev 204)
+++ trunk/OpenMPT/mptrack/tuningRatioMapWnd.h	2008-03-17 18:11:44 UTC (rev 205)
@@ -5,7 +5,7 @@
 
 class CTuningDialog;
 
-using CTuning::NOTEINDEXTYPE;
+typedef CTuning::NOTEINDEXTYPE NOTEINDEXTYPE;
 
 //Copied from CNoteMapWnd.
 //===============================

Modified: trunk/OpenMPT/soundlib/Sndfile.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndfile.cpp	2008-03-15 12:38:52 UTC (rev 204)
+++ trunk/OpenMPT/soundlib/Sndfile.cpp	2008-03-17 18:11:44 UTC (rev 205)
@@ -2948,7 +2948,7 @@
 const CModSpecifications& CSoundFile::GetModSpecifications(const MODTYPE type)
 //----------------------------------------------------------------------------
 {
-	CModSpecifications* p = 0;
+	const CModSpecifications* p = 0;
 	SetModSpecsPointer(p, type);
 	return *p;
 }

Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp	2008-03-15 12:38:52 UTC (rev 204)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp	2008-03-17 18:11:44 UTC (rev 205)
@@ -99,7 +99,7 @@
 	0x92, 0x94, 0x96, 0x98,
 };
 
-using CTuning::RATIOTYPE;
+typedef CTuning::RATIOTYPE RATIOTYPE;
 
 static const RATIOTYPE TwoToPowerXOver12Table[16] =
 {

Modified: trunk/OpenMPT/soundlib/midi.h
===================================================================
--- trunk/OpenMPT/soundlib/midi.h	2008-03-15 12:38:52 UTC (rev 204)
+++ trunk/OpenMPT/soundlib/midi.h	2008-03-17 18:11:44 UTC (rev 205)
@@ -92,6 +92,7 @@
 class CSoundFile;
 inline bool operator<(const CMIDIMappingDirective& a, const CMIDIMappingDirective& b) {return a.GetController() < b.GetController();}
 inline bool operator<(const CMIDIMappingDirective& d, const BYTE& ctrlVal) {return d.GetController() < ctrlVal;}
+inline bool operator<(const BYTE& ctrlVal, const CMIDIMappingDirective& d) {return ctrlVal < d.GetController();}
 
 //===============
 class CMIDIMapper

Modified: trunk/OpenMPT/soundlib/tuning.cpp
===================================================================
--- trunk/OpenMPT/soundlib/tuning.cpp	2008-03-15 12:38:52 UTC (rev 204)
+++ trunk/OpenMPT/soundlib/tuning.cpp	2008-03-17 18:11:44 UTC (rev 205)
@@ -4,11 +4,11 @@
 #include "../mptrack/serialization_utils.h"
 #include <string>
 
-using CTuningRTI::RATIOTYPE;
-using CTuningRTI::NOTEINDEXTYPE;
-using CTuningRTI::UNOTEINDEXTYPE;
-using CTuningRTI::STEPINDEXTYPE;
-using CTuningRTI::USTEPINDEXTYPE;
+typedef CTuningRTI::RATIOTYPE RATIOTYPE;
+typedef CTuningRTI::NOTEINDEXTYPE NOTEINDEXTYPE;
+typedef CTuningRTI::UNOTEINDEXTYPE UNOTEINDEXTYPE;
+typedef CTuningRTI::STEPINDEXTYPE STEPINDEXTYPE;
+typedef  CTuningRTI::USTEPINDEXTYPE USTEPINDEXTYPE;
 
 const NOTEINDEXTYPE CTuningRTI::s_StepMinDefault(-64);
 const UNOTEINDEXTYPE CTuningRTI::s_RatioTableSizeDefault(128);
@@ -77,7 +77,7 @@
 	BelowRatios = AboveRatios = DefaultBARFUNC;
 
 	m_RatioTable.resize(vr.second-vr.first+1);
-	std::copy(v.begin(), v.end(), m_RatioTable.begin() + ratiostartpos - vr.first);
+	std::copy(v.begin(), v.end(), m_RatioTable.begin() + (ratiostartpos - vr.first));
 
 	for(NOTEINDEXTYPE i = ratiostartpos-1; i>=m_StepMin && ratiostartpos > NOTEINDEXTYPE_MIN; i--)
 	{


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