Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2849] trunk/OpenMPT
|
From: <man...@us...> - 2013-10-11 04:53:44
|
Revision: 2849
http://sourceforge.net/p/modplug/code/2849
Author: manxorist
Date: 2013-10-11 04:53:37 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
[Fix] Mingw64 headers implement the UNREFERENCED_PARAMETER(x) macro as an assignment (x)=(x). This breaks for parameters which are declared const and is undesireable anyway because it potentially invokes a copy assignment operator. Only ever use the system-provided UNEREFERENCED_PARAMETER macro on MSVC and fallback to (void)(x) for all other compilers. In order to not conflict with the system header definition, rename our version to MPT_UNREFERENCED_PARAMETER(x) .
Modified Paths:
--------------
trunk/OpenMPT/common/typedefs.cpp
trunk/OpenMPT/common/typedefs.h
trunk/OpenMPT/mptrack/CleanupSong.cpp
trunk/OpenMPT/mptrack/ColourEdit.cpp
trunk/OpenMPT/mptrack/CreditStatic.cpp
trunk/OpenMPT/mptrack/Ctrl_seq.cpp
trunk/OpenMPT/mptrack/DefaultVstEditor.cpp
trunk/OpenMPT/mptrack/EffectVis.cpp
trunk/OpenMPT/mptrack/Mpdlgs.cpp
trunk/OpenMPT/mptrack/StreamEncoder.cpp
trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp
trunk/OpenMPT/mptrack/dlg_misc.cpp
trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
trunk/OpenMPT/soundlib/Fastmix.cpp
trunk/OpenMPT/soundlib/Load_it.cpp
trunk/OpenMPT/soundlib/Load_itp.cpp
trunk/OpenMPT/soundlib/ModInstrument.cpp
trunk/OpenMPT/soundlib/SampleFormats.cpp
trunk/OpenMPT/soundlib/Sndmix.cpp
trunk/OpenMPT/soundlib/Tables.cpp
trunk/OpenMPT/soundlib/load_j2b.cpp
trunk/OpenMPT/test/test.cpp
Modified: trunk/OpenMPT/common/typedefs.cpp
===================================================================
--- trunk/OpenMPT/common/typedefs.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/common/typedefs.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -176,11 +176,11 @@
<< std::endl;
#endif // MODPLUG_TRACKER
#else
- UNREFERENCED_PARAMETER(file);
- UNREFERENCED_PARAMETER(line);
- UNREFERENCED_PARAMETER(function);
- UNREFERENCED_PARAMETER(format);
- UNREFERENCED_PARAMETER(args);
+ MPT_UNREFERENCED_PARAMETER(file);
+ MPT_UNREFERENCED_PARAMETER(line);
+ MPT_UNREFERENCED_PARAMETER(function);
+ MPT_UNREFERENCED_PARAMETER(format);
+ MPT_UNREFERENCED_PARAMETER(args);
#endif
}
Modified: trunk/OpenMPT/common/typedefs.h
===================================================================
--- trunk/OpenMPT/common/typedefs.h 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/common/typedefs.h 2013-10-11 04:53:37 UTC (rev 2849)
@@ -369,7 +369,9 @@
-#ifndef UNREFERENCED_PARAMETER
-#define UNREFERENCED_PARAMETER(x) (void)(x)
+#if MPT_COMPILER_MSVC && defined(UNREFERENCED_PARAMETER)
+#define MPT_UNREFERENCED_PARAMETER(x) UNREFERENCED_PARAMETER(x)
+#else
+#define MPT_UNREFERENCED_PARAMETER(x) (void)(x)
#endif
Modified: trunk/OpenMPT/mptrack/CleanupSong.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CleanupSong.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/CleanupSong.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -257,8 +257,8 @@
BOOL CModCleanupDlg::OnToolTipNotify(UINT id, NMHDR* pNMHDR, LRESULT* pResult)
//----------------------------------------------------------------------------
{
- UNREFERENCED_PARAMETER(id);
- UNREFERENCED_PARAMETER(pResult);
+ MPT_UNREFERENCED_PARAMETER(id);
+ MPT_UNREFERENCED_PARAMETER(pResult);
// need to handle both ANSI and UNICODE versions of the message
TOOLTIPTEXTA* pTTTA = (TOOLTIPTEXTA*)pNMHDR;
Modified: trunk/OpenMPT/mptrack/ColourEdit.cpp
===================================================================
--- trunk/OpenMPT/mptrack/ColourEdit.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/ColourEdit.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -35,7 +35,7 @@
HBRUSH CColourEdit::CtlColor(CDC* pDC, UINT nCtlColor)
{
- UNREFERENCED_PARAMETER(nCtlColor);
+ MPT_UNREFERENCED_PARAMETER(nCtlColor);
pDC->SetTextColor(m_crText); //set text color
pDC->SetBkColor(m_crBackGnd); //set the text's background color
return m_brBackGnd; //return the brush used for background - this sets control background
Modified: trunk/OpenMPT/mptrack/CreditStatic.cpp
===================================================================
--- trunk/OpenMPT/mptrack/CreditStatic.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/CreditStatic.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -232,7 +232,7 @@
BOOL CCreditStatic::OnEraseBkgnd(CDC* pDC)
{
- UNREFERENCED_PARAMETER(pDC);
+ MPT_UNREFERENCED_PARAMETER(pDC);
return TRUE;
// return CStatic::OnEraseBkgnd(pDC);
Modified: trunk/OpenMPT/mptrack/Ctrl_seq.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/Ctrl_seq.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -1049,7 +1049,7 @@
void COrderList::OnMButtonDown(UINT nFlags, CPoint pt)
//----------------------------------------------------
{
- UNREFERENCED_PARAMETER(nFlags);
+ MPT_UNREFERENCED_PARAMETER(nFlags);
QueuePattern(pt);
}
Modified: trunk/OpenMPT/mptrack/DefaultVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/DefaultVstEditor.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/DefaultVstEditor.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -375,8 +375,8 @@
BOOL CDefaultVstEditor::OnMouseWheel(UINT nFlags, short zDelta, CPoint pt)
//------------------------------------------------------------------------
{
- UNREFERENCED_PARAMETER(nFlags);
- UNREFERENCED_PARAMETER(pt);
+ MPT_UNREFERENCED_PARAMETER(nFlags);
+ MPT_UNREFERENCED_PARAMETER(pt);
// Mouse wheel - scroll parameter list
int minpos, maxpos;
Modified: trunk/OpenMPT/mptrack/EffectVis.cpp
===================================================================
--- trunk/OpenMPT/mptrack/EffectVis.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/EffectVis.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -339,7 +339,7 @@
//-----------------------------------------------------------------------------------------
void CEffectVis::ShowVis(CDC * pDC, CRect rectBorder)
{
- UNREFERENCED_PARAMETER(rectBorder);
+ MPT_UNREFERENCED_PARAMETER(rectBorder);
if (m_boolForceRedraw)
{
m_boolForceRedraw = FALSE ;
@@ -530,9 +530,9 @@
void CEffectVis::OnSize(UINT nType, int cx, int cy)
{
- UNREFERENCED_PARAMETER(nType);
- UNREFERENCED_PARAMETER(cx);
- UNREFERENCED_PARAMETER(cy);
+ MPT_UNREFERENCED_PARAMETER(nType);
+ MPT_UNREFERENCED_PARAMETER(cx);
+ MPT_UNREFERENCED_PARAMETER(cy);
GetClientRect(&m_rcFullWin);
m_rcDraw.SetRect( m_rcFullWin.left + LEFTBORDER, m_rcFullWin.top + TOPBORDER,
m_rcFullWin.right - RIGHTBORDER, m_rcFullWin.bottom - BOTTOMBORDER);
Modified: trunk/OpenMPT/mptrack/Mpdlgs.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mpdlgs.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/Mpdlgs.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -241,7 +241,7 @@
void COptionsSoundcard::UpdateChannels(int dev)
//---------------------------------------------
{
- UNREFERENCED_PARAMETER(dev);
+ MPT_UNREFERENCED_PARAMETER(dev);
CHAR s[128];
UINT n = 0;
m_CbnChannels.ResetContent();
Modified: trunk/OpenMPT/mptrack/StreamEncoder.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoder.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/StreamEncoder.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -34,22 +34,22 @@
void StreamWriterBase::WriteMetatags(const FileTags &tags)
//--------------------------------------------------------
{
- UNREFERENCED_PARAMETER(tags);
+ MPT_UNREFERENCED_PARAMETER(tags);
}
void StreamWriterBase::WriteInterleavedConverted(size_t frameCount, const char *data)
//-----------------------------------------------------------------------------------
{
- UNREFERENCED_PARAMETER(frameCount);
- UNREFERENCED_PARAMETER(data);
+ MPT_UNREFERENCED_PARAMETER(frameCount);
+ MPT_UNREFERENCED_PARAMETER(data);
}
void StreamWriterBase::WriteCues(const std::vector<uint64> &cues)
//---------------------------------------------------------------
{
- UNREFERENCED_PARAMETER(cues);
+ MPT_UNREFERENCED_PARAMETER(cues);
}
Modified: trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/StreamEncoderFLAC.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -50,23 +50,23 @@
}
FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame)
{
- UNREFERENCED_PARAMETER(encoder);
- UNREFERENCED_PARAMETER(samples);
- UNREFERENCED_PARAMETER(current_frame);
+ MPT_UNREFERENCED_PARAMETER(encoder);
+ MPT_UNREFERENCED_PARAMETER(samples);
+ MPT_UNREFERENCED_PARAMETER(current_frame);
f.write(reinterpret_cast<const char*>(buffer), bytes);
if(!f) return FLAC__STREAM_ENCODER_WRITE_STATUS_FATAL_ERROR;
return FLAC__STREAM_ENCODER_WRITE_STATUS_OK;
}
FLAC__StreamEncoderSeekStatus SeekCallback(const FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset)
{
- UNREFERENCED_PARAMETER(encoder);
+ MPT_UNREFERENCED_PARAMETER(encoder);
f.seekp(absolute_byte_offset);
if(!f) return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR;
return FLAC__STREAM_ENCODER_SEEK_STATUS_OK;
}
FLAC__StreamEncoderTellStatus TellCallback(const FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset)
{
- UNREFERENCED_PARAMETER(encoder);
+ MPT_UNREFERENCED_PARAMETER(encoder);
if(absolute_byte_offset)
{
*absolute_byte_offset = f.tellp();
@@ -138,8 +138,8 @@
}
virtual void SetFormat(int samplerate, int channels, const Encoder::Settings &settings)
{
- UNREFERENCED_PARAMETER(samplerate);
- UNREFERENCED_PARAMETER(channels);
+ MPT_UNREFERENCED_PARAMETER(samplerate);
+ MPT_UNREFERENCED_PARAMETER(channels);
FinishStream();
Modified: trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/StreamEncoderMP3.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -405,7 +405,7 @@
}
static void GenreEnumCallback(int num, const char *name, void *cookie)
{
- UNREFERENCED_PARAMETER(num);
+ MPT_UNREFERENCED_PARAMETER(num);
Encoder::Traits &traits = *reinterpret_cast<Encoder::Traits*>(cookie);
if(name)
{
Modified: trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp
===================================================================
--- trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/StreamEncoderWAV.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -76,8 +76,8 @@
}
virtual void SetFormat(int samplerate, int channels, const Encoder::Settings &settings)
{
- UNREFERENCED_PARAMETER(samplerate);
- UNREFERENCED_PARAMETER(channels);
+ MPT_UNREFERENCED_PARAMETER(samplerate);
+ MPT_UNREFERENCED_PARAMETER(channels);
FinishStream();
Modified: trunk/OpenMPT/mptrack/dlg_misc.cpp
===================================================================
--- trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/mptrack/dlg_misc.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -391,8 +391,8 @@
BOOL CModTypeDlg::OnToolTipNotify(UINT id, NMHDR* pNMHDR, LRESULT* pResult)
//-------------------------------------------------------------------------
{
- UNREFERENCED_PARAMETER(id);
- UNREFERENCED_PARAMETER(pResult);
+ MPT_UNREFERENCED_PARAMETER(id);
+ MPT_UNREFERENCED_PARAMETER(pResult);
// need to handle both ANSI and UNICODE versions of the message
TOOLTIPTEXTA* pTTTA = (TOOLTIPTEXTA*)pNMHDR;
Modified: trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/sounddev/SoundDeviceASIO.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -665,7 +665,7 @@
void CASIODevice::BufferSwitch(long doubleBufferIndex, ASIOBool directProcess)
//----------------------------------------------------------------------------
{
- UNREFERENCED_PARAMETER(directProcess);
+ MPT_UNREFERENCED_PARAMETER(directProcess);
if(gpCurrentAsio)
{
gpCurrentAsio->BufferSwitch(doubleBufferIndex);
@@ -679,16 +679,16 @@
void CASIODevice::SampleRateDidChange(ASIOSampleRate sRate)
//---------------------------------------------------------
{
- UNREFERENCED_PARAMETER(sRate);
+ MPT_UNREFERENCED_PARAMETER(sRate);
}
long CASIODevice::AsioMessage(long selector, long value, void* message, double* opt)
//----------------------------------------------------------------------------------
{
- UNREFERENCED_PARAMETER(value);
- UNREFERENCED_PARAMETER(message);
- UNREFERENCED_PARAMETER(opt);
+ MPT_UNREFERENCED_PARAMETER(value);
+ MPT_UNREFERENCED_PARAMETER(message);
+ MPT_UNREFERENCED_PARAMETER(opt);
#ifdef ASIO_LOG
// Log("AsioMessage(%d, %d)\n", selector, value);
#endif
Modified: trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp
===================================================================
--- trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/sounddev/SoundDevicePortAudio.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -203,8 +203,8 @@
)
//-----------------------------------------
{
- UNREFERENCED_PARAMETER(input);
- UNREFERENCED_PARAMETER(statusFlags);
+ MPT_UNREFERENCED_PARAMETER(input);
+ MPT_UNREFERENCED_PARAMETER(statusFlags);
if(!output) return paAbort;
if(Pa_GetHostApiInfo(m_HostApi)->type == paWDMKS)
{
Modified: trunk/OpenMPT/soundlib/Fastmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Fastmix.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/Fastmix.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -380,7 +380,7 @@
#define BEGIN_MIX_INTERFACE(func)\
void func(ModChannel *pChannel, const CResampler *pResampler, int *pbuffer, int *pbufmax)\
{\
- UNREFERENCED_PARAMETER(pResampler);\
+ MPT_UNREFERENCED_PARAMETER(pResampler);\
LONG nPos;
#define END_MIX_INTERFACE()\
Modified: trunk/OpenMPT/soundlib/Load_it.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_it.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/Load_it.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -1055,7 +1055,7 @@
const size_t num = (pModDoc != nullptr) ? pModDoc->GetFileHistory().size() + 1 : 0; // + 1 for this session
#else
const size_t num = 0;
- UNREFERENCED_PARAMETER(pSndFile);
+ MPT_UNREFERENCED_PARAMETER(pSndFile);
#endif // MODPLUG_TRACKER
uint16 fnum = (uint16)MIN(num, uint16_max); // Number of entries that are actually going to be written
Modified: trunk/OpenMPT/soundlib/Load_itp.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Load_itp.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/Load_itp.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -49,8 +49,8 @@
//-------------------------------------------------------------------------
{
#ifndef MODPLUG_TRACKER
- UNREFERENCED_PARAMETER(file);
- UNREFERENCED_PARAMETER(loadFlags);
+ MPT_UNREFERENCED_PARAMETER(file);
+ MPT_UNREFERENCED_PARAMETER(loadFlags);
return false;
#else // MODPLUG_TRACKER
@@ -283,7 +283,7 @@
//-------------------------------------------------
{
#ifndef MODPLUG_TRACKER
- UNREFERENCED_PARAMETER(lpszFileName);
+ MPT_UNREFERENCED_PARAMETER(lpszFileName);
return false;
#else // MODPLUG_TRACKER
Modified: trunk/OpenMPT/soundlib/ModInstrument.cpp
===================================================================
--- trunk/OpenMPT/soundlib/ModInstrument.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/ModInstrument.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -170,7 +170,7 @@
void ModInstrument::Convert(MODTYPE fromType, MODTYPE toType)
//-----------------------------------------------------------
{
- UNREFERENCED_PARAMETER(fromType);
+ MPT_UNREFERENCED_PARAMETER(fromType);
if(toType & MOD_TYPE_XM)
{
Modified: trunk/OpenMPT/soundlib/SampleFormats.cpp
===================================================================
--- trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/SampleFormats.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -1922,7 +1922,7 @@
ASSERT((bps <= 8 && sample.GetElementarySampleSize() == 1) || (bps > 8 && sample.GetElementarySampleSize() == 2));
ASSERT(modChannels <= FLAC__stream_decoder_get_channels(decoder));
ASSERT(bps == FLAC__stream_decoder_get_bits_per_sample(decoder));
- UNREFERENCED_PARAMETER(decoder); // decoder is unused if ASSERTs are compiled out
+ MPT_UNREFERENCED_PARAMETER(decoder); // decoder is unused if ASSERTs are compiled out
// Do the sample conversion
for(uint8 chn = 0; chn < modChannels; chn++)
@@ -2041,8 +2041,8 @@
return true;
}
#else
- UNREFERENCED_PARAMETER(sample);
- UNREFERENCED_PARAMETER(file);
+ MPT_UNREFERENCED_PARAMETER(sample);
+ MPT_UNREFERENCED_PARAMETER(file);
#endif // NO_FLAC
return false;
}
@@ -2203,8 +2203,8 @@
FLAC__stream_encoder_delete(encoder);
return true;
#else
- UNREFERENCED_PARAMETER(nSample);
- UNREFERENCED_PARAMETER(lpszFileName);
+ MPT_UNREFERENCED_PARAMETER(nSample);
+ MPT_UNREFERENCED_PARAMETER(lpszFileName);
return false;
#endif // NO_FLAC
}
@@ -2376,8 +2376,8 @@
return true;
}
#else
- UNREFERENCED_PARAMETER(sample);
- UNREFERENCED_PARAMETER(file);
+ MPT_UNREFERENCED_PARAMETER(sample);
+ MPT_UNREFERENCED_PARAMETER(file);
#endif // NO_MP3_SAMPLES
return false;
}
Modified: trunk/OpenMPT/soundlib/Sndmix.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Sndmix.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/Sndmix.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -291,7 +291,7 @@
}
#endif // NO_AGC
#if defined(NO_DSP) && defined(NO_EQ) && defined(NO_AGC)
- UNREFERENCED_PARAMETER(countChunk);
+ MPT_UNREFERENCED_PARAMETER(countChunk);
#endif
}
Modified: trunk/OpenMPT/soundlib/Tables.cpp
===================================================================
--- trunk/OpenMPT/soundlib/Tables.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/Tables.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -226,7 +226,7 @@
}
}
#else
- UNREFERENCED_PARAMETER(otherFormats);
+ MPT_UNREFERENCED_PARAMETER(otherFormats);
#endif
return exts;
}
Modified: trunk/OpenMPT/soundlib/load_j2b.cpp
===================================================================
--- trunk/OpenMPT/soundlib/load_j2b.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/soundlib/load_j2b.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -981,8 +981,8 @@
#ifdef NO_ZLIB
- UNREFERENCED_PARAMETER(file);
- UNREFERENCED_PARAMETER(loadFlags);
+ MPT_UNREFERENCED_PARAMETER(file);
+ MPT_UNREFERENCED_PARAMETER(loadFlags);
return false;
#else
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp 2013-10-10 10:42:02 UTC (rev 2848)
+++ trunk/OpenMPT/test/test.cpp 2013-10-11 04:53:37 UTC (rev 2849)
@@ -155,7 +155,7 @@
#define TEST_TRY try {
#define TEST_CATCH } catch(...) { ReportExceptionAndBreak(THIS_FILE, __LINE__, description, true); }
#define TEST_START() do { } while(0)
-#define TEST_OK() do { UNREFERENCED_PARAMETER(description); } while(0)
+#define TEST_OK() do { MPT_UNREFERENCED_PARAMETER(description); } while(0)
#define TEST_FAIL() ReportErrorAndBreak(THIS_FILE, __LINE__, description, false)
#define TEST_FAIL_STOP() ReportErrorAndBreak(THIS_FILE, __LINE__, description, true)
@@ -173,9 +173,9 @@
static noinline void show_ok(const char * const file, const int line, const char * const description)
{
- UNREFERENCED_PARAMETER(file);
- UNREFERENCED_PARAMETER(line);
- UNREFERENCED_PARAMETER(description);
+ MPT_UNREFERENCED_PARAMETER(file);
+ MPT_UNREFERENCED_PARAMETER(line);
+ MPT_UNREFERENCED_PARAMETER(description);
std::cout << "PASS" << std::endl;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
