_DEBUG -> DEBUG
This commit is contained in:
@@ -123,7 +123,7 @@ void ActorFrame::LoadChildrenFromNode( const XNode* pNode )
|
|||||||
|
|
||||||
void ActorFrame::AddChild( Actor *pActor )
|
void ActorFrame::AddChild( Actor *pActor )
|
||||||
{
|
{
|
||||||
#if _DEBUG
|
#ifdef DEBUG
|
||||||
// check that this Actor isn't already added.
|
// check that this Actor isn't already added.
|
||||||
vector<Actor*>::iterator iter = find( m_SubActors.begin(), m_SubActors.end(), pActor );
|
vector<Actor*>::iterator iter = find( m_SubActors.begin(), m_SubActors.end(), pActor );
|
||||||
if( iter != m_SubActors.end() )
|
if( iter != m_SubActors.end() )
|
||||||
|
|||||||
@@ -162,7 +162,7 @@ void MessageManager::Subscribe( IMessageSubscriber* pSubscriber, const RString&
|
|||||||
LockMut(g_Mutex);
|
LockMut(g_Mutex);
|
||||||
|
|
||||||
SubscribersSet& subs = g_MessageToSubscribers[sMessage];
|
SubscribersSet& subs = g_MessageToSubscribers[sMessage];
|
||||||
#if _DEBUG
|
#ifdef DEBUG
|
||||||
SubscribersSet::iterator iter = subs.find(pSubscriber);
|
SubscribersSet::iterator iter = subs.find(pSubscriber);
|
||||||
ASSERT_M( iter == subs.end(), ssprintf("already subscribed to '%s'",sMessage.c_str()) );
|
ASSERT_M( iter == subs.end(), ssprintf("already subscribed to '%s'",sMessage.c_str()) );
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -13,11 +13,11 @@
|
|||||||
#include "mad-0.15.1b/mad.h"
|
#include "mad-0.15.1b/mad.h"
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
#ifdef _XBOX
|
#ifdef _XBOX
|
||||||
#ifdef _DEBUG
|
#ifdef DEBUG
|
||||||
#pragma comment(lib, "mad-0.15.1b/xboxmad/debug/xboxmad.lib")
|
#pragma comment(lib, "mad-0.15.1b/xboxmad/debug/xboxmad.lib")
|
||||||
#else
|
#else
|
||||||
#pragma comment(lib, "mad-0.15.1b/xboxmad/Release/xboxmad.lib")
|
#pragma comment(lib, "mad-0.15.1b/xboxmad/Release/xboxmad.lib")
|
||||||
#endif // _DEBUG
|
#endif // DEBUG
|
||||||
#else
|
#else
|
||||||
#pragma comment(lib, "mad-0.15.1b/msvc++/Release/libmad.lib")
|
#pragma comment(lib, "mad-0.15.1b/msvc++/Release/libmad.lib")
|
||||||
#endif // _XBOX
|
#endif // _XBOX
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ public:
|
|||||||
{
|
{
|
||||||
if( m_pSubscribers == NULL )
|
if( m_pSubscribers == NULL )
|
||||||
m_pSubscribers = new set<T*>;
|
m_pSubscribers = new set<T*>;
|
||||||
#if _DEBUG
|
#ifdef DEBUG
|
||||||
typename set<T*>::iterator iter = m_pSubscribers->find( p );
|
typename set<T*>::iterator iter = m_pSubscribers->find( p );
|
||||||
ASSERT_M( iter == m_pSubscribers->end(), "already subscribed" );
|
ASSERT_M( iter == m_pSubscribers->end(), "already subscribed" );
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user