Browse Source

more CHECK_REENTRANT_MUTEX

David Rose 20 years ago
parent
commit
c3aa9a995c
2 changed files with 4 additions and 4 deletions
  1. 3 3
      panda/src/express/mutexDummyImpl.I
  2. 1 1
      panda/src/express/mutexDummyImpl.h

+ 3 - 3
panda/src/express/mutexDummyImpl.I

@@ -24,7 +24,7 @@
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 INLINE MutexDummyImpl::
 INLINE MutexDummyImpl::
 MutexDummyImpl() {
 MutexDummyImpl() {
-#ifndef NDEBUG
+#ifdef CHECK_REENTRANT_MUTEX
   _lock_count = 0;
   _lock_count = 0;
 #endif
 #endif
 }
 }
@@ -46,7 +46,7 @@ INLINE MutexDummyImpl::
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 INLINE void MutexDummyImpl::
 INLINE void MutexDummyImpl::
 lock() {
 lock() {
-#ifndef NDEBUG
+#ifdef CHECK_REENTRANT_MUTEX
   _lock_count++;
   _lock_count++;
   nassertv(_lock_count == 1);
   nassertv(_lock_count == 1);
 #endif
 #endif
@@ -59,7 +59,7 @@ lock() {
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 INLINE void MutexDummyImpl::
 INLINE void MutexDummyImpl::
 release() {
 release() {
-#ifndef NDEBUG
+#ifdef CHECK_REENTRANT_MUTEX
   _lock_count--;
   _lock_count--;
   nassertv(_lock_count == 0);
   nassertv(_lock_count == 0);
 #endif
 #endif

+ 1 - 1
panda/src/express/mutexDummyImpl.h

@@ -42,7 +42,7 @@ public:
   INLINE void release();
   INLINE void release();
 
 
 private:
 private:
-#ifndef NDEBUG
+#ifdef CHECK_REENTRANT_MUTEX
   int _lock_count;
   int _lock_count;
 #endif
 #endif
 };
 };