diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 11:57:55 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-30 11:57:55 +0400 |
| commit | 5b5e600db6f529ad7e1af9d4bb3a193be2265342 (patch) | |
| tree | 224486ae4d65cd7903c2ab0bff2f43357099cb00 /intern/audaspace | |
| parent | 5bac37f6d4d2e8d584ae0ec6bafd2808c47fbb25 (diff) | |
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.
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/intern/AUD_Reference.h | 19 |
1 files changed, 10 insertions, 9 deletions
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 <map> +#include <cstddef> // #define MEM_DEBUG @@ -113,15 +114,15 @@ public: m_reference = dynamic_cast<T*>(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<T*>(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; } /** |