From 5b5e600db6f529ad7e1af9d4bb3a193be2265342 Mon Sep 17 00:00:00 2001 From: Joerg Mueller Date: Tue, 30 Aug 2011 07:57:55 +0000 Subject: Last bunch of minor fixes before merge. * Use NULL in AUD_Reference.h * Use SETLOOPER in sound.c * Move flags to the end of Speaker struct. --- intern/audaspace/intern/AUD_Reference.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'intern/audaspace') diff --git a/intern/audaspace/intern/AUD_Reference.h b/intern/audaspace/intern/AUD_Reference.h index f78de40c3bb..4b878fc8d46 100644 --- a/intern/audaspace/intern/AUD_Reference.h +++ b/intern/audaspace/intern/AUD_Reference.h @@ -32,6 +32,7 @@ #define AUD_REFERENCE #include +#include // #define MEM_DEBUG @@ -113,15 +114,15 @@ public: m_reference = dynamic_cast(reference); AUD_ReferenceHandler::incref(m_original); #ifdef MEM_DEBUG - if(m_reference != 0) + if(m_reference != NULL) std::cerr << "+" << typeid(*m_reference).name() << std::endl; #endif } AUD_Reference() { - m_original = 0; - m_reference = 0; + m_original = NULL; + m_reference = NULL; } /** @@ -134,7 +135,7 @@ public: m_reference = ref.m_reference; AUD_ReferenceHandler::incref(m_original); #ifdef MEM_DEBUG - if(m_reference != 0) + if(m_reference != NULL) std::cerr << "+" << typeid(*m_reference).name() << std::endl; #endif } @@ -146,7 +147,7 @@ public: m_reference = dynamic_cast(ref.get()); AUD_ReferenceHandler::incref(m_original); #ifdef MEM_DEBUG - if(m_reference != 0) + if(m_reference != NULL) std::cerr << "+" << typeid(*m_reference).name() << std::endl; #endif } @@ -158,7 +159,7 @@ public: ~AUD_Reference() { #ifdef MEM_DEBUG - if(m_reference != 0) + if(m_reference != NULL) std::cerr << "-" << typeid(*m_reference).name() << std::endl; #endif if(AUD_ReferenceHandler::decref(m_original)) @@ -175,7 +176,7 @@ public: return *this; #ifdef MEM_DEBUG - if(m_reference != 0) + if(m_reference != NULL) std::cerr << "-" << typeid(*m_reference).name() << std::endl; #endif if(AUD_ReferenceHandler::decref(m_original)) @@ -185,7 +186,7 @@ public: m_reference = ref.m_reference; AUD_ReferenceHandler::incref(m_original); #ifdef MEM_DEBUG - if(m_reference != 0) + if(m_reference != NULL) std::cerr << "+" << typeid(*m_reference).name() << std::endl; #endif @@ -197,7 +198,7 @@ public: */ inline bool isNull() const { - return m_reference == 0; + return m_reference == NULL; } /** -- cgit v1.2.3