From 17cc65e8fdc337311aa0a9e65eb07d24192e69d6 Mon Sep 17 00:00:00 2001 From: Steve Checkoway Date: Tue, 6 Jan 2009 17:54:21 +0000 Subject: [PATCH] _DEBUG -> DEBUG --- stepmania/src/ActorFrame.cpp | 2 +- stepmania/src/MessageManager.cpp | 2 +- stepmania/src/RageSoundReader_MP3.cpp | 4 ++-- stepmania/src/SubscriptionManager.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stepmania/src/ActorFrame.cpp b/stepmania/src/ActorFrame.cpp index bcc34be54a..c3bc17eac6 100644 --- a/stepmania/src/ActorFrame.cpp +++ b/stepmania/src/ActorFrame.cpp @@ -123,7 +123,7 @@ void ActorFrame::LoadChildrenFromNode( const XNode* pNode ) void ActorFrame::AddChild( Actor *pActor ) { -#if _DEBUG +#ifdef DEBUG // check that this Actor isn't already added. vector::iterator iter = find( m_SubActors.begin(), m_SubActors.end(), pActor ); if( iter != m_SubActors.end() ) diff --git a/stepmania/src/MessageManager.cpp b/stepmania/src/MessageManager.cpp index f97f1559e5..f188092a64 100644 --- a/stepmania/src/MessageManager.cpp +++ b/stepmania/src/MessageManager.cpp @@ -162,7 +162,7 @@ void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, const RString& LockMut(g_Mutex); SubscribersSet& subs = g_MessageToSubscribers[sMessage]; -#if _DEBUG +#ifdef DEBUG SubscribersSet::iterator iter = subs.find(pSubscriber); ASSERT_M( iter == subs.end(), ssprintf("already subscribed to '%s'",sMessage.c_str()) ); #endif diff --git a/stepmania/src/RageSoundReader_MP3.cpp b/stepmania/src/RageSoundReader_MP3.cpp index fd6a8796c2..61b9b9d18d 100644 --- a/stepmania/src/RageSoundReader_MP3.cpp +++ b/stepmania/src/RageSoundReader_MP3.cpp @@ -13,11 +13,11 @@ #include "mad-0.15.1b/mad.h" #ifdef _MSC_VER #ifdef _XBOX -#ifdef _DEBUG +#ifdef DEBUG #pragma comment(lib, "mad-0.15.1b/xboxmad/debug/xboxmad.lib") #else #pragma comment(lib, "mad-0.15.1b/xboxmad/Release/xboxmad.lib") -#endif // _DEBUG +#endif // DEBUG #else #pragma comment(lib, "mad-0.15.1b/msvc++/Release/libmad.lib") #endif // _XBOX diff --git a/stepmania/src/SubscriptionManager.h b/stepmania/src/SubscriptionManager.h index 02faed01f3..58ca1e5e46 100644 --- a/stepmania/src/SubscriptionManager.h +++ b/stepmania/src/SubscriptionManager.h @@ -33,7 +33,7 @@ public: { if( m_pSubscribers == NULL ) m_pSubscribers = new set; -#if _DEBUG +#ifdef DEBUG typename set::iterator iter = m_pSubscribers->find( p ); ASSERT_M( iter == m_pSubscribers->end(), "already subscribed" ); #endif