basic-programmer-python
diff --git a/‎dtool/src/dtoolbase/memoryHook.cxx
Lines changed: 11 additions & 16 deletions b/‎dtool/src/dtoolbase/memoryHook.cxx
Lines changed: 11 additions & 16 deletions
diff --git a/‎dtool/src/dtoolbase/memoryHook.h
Lines changed: 1 addition & 3 deletions b/‎dtool/src/dtoolbase/memoryHook.h
Lines changed: 1 addition & 3 deletions
diff --git a/‎dtool/src/dtoolbase/typeRegistryNode.cxx
Lines changed: 0 additions & 2 deletions b/‎dtool/src/dtoolbase/typeRegistryNode.cxx
Lines changed: 0 additions & 2 deletions
diff --git a/‎dtool/src/dtoolbase/typeRegistryNode.h
Lines changed: 0 additions & 2 deletions b/‎dtool/src/dtoolbase/typeRegistryNode.h
Lines changed: 0 additions & 2 deletions
diff --git a/‎panda/src/express/memoryInfo.h
Lines changed: 3 additions & 0 deletions b/‎panda/src/express/memoryInfo.h
Lines changed: 3 additions & 0 deletions
@@ -202,33 +202,28 @@ MemoryHook() {
 
 #endif  // WIN32
 
-#ifdef DO_MEMORY_USAGE
   _total_heap_single_size = 0;
   _total_heap_array_size = 0;
   _requested_heap_size = 0;
   _total_mmap_size = 0;
   _max_heap_size = ~(size_t)0;
-#endif
 }
 
 /**
  *
  */
 MemoryHook::
 MemoryHook(const MemoryHook &copy) :
-  _page_size(copy._page_size)
-{
-#ifdef DO_MEMORY_USAGE
-  _total_heap_single_size = copy._total_heap_single_size;
-  _total_heap_array_size = copy._total_heap_array_size;
-  _requested_heap_size = copy._requested_heap_size;
-  _total_mmap_size = copy._total_mmap_size;
-  _max_heap_size = copy._max_heap_size;
-#endif
-
-  ((MutexImpl &)copy._lock).acquire();
+  _page_size(copy._page_size),
+  _total_heap_single_size(copy._total_heap_single_size),
+  _total_heap_array_size(copy._total_heap_array_size),
+  _requested_heap_size(copy._requested_heap_size),
+  _total_mmap_size(copy._total_mmap_size),
+  _max_heap_size(copy._max_heap_size) {
+
+  copy._lock.acquire();
   _deleted_chains = copy._deleted_chains;
-  ((MutexImpl &)copy._lock).release();
+  copy._lock.release();
 }
 
 /**
@@ -631,7 +626,6 @@ alloc_fail(size_t attempted_size) {
   abort();
 }
 
-#ifdef DO_MEMORY_USAGE
 /**
  * This callback method is called whenever the total allocated heap size
  * exceeds _max_heap_size.  It's mainly intended for reporting memory leaks,
@@ -642,6 +636,7 @@ alloc_fail(size_t attempted_size) {
  */
 void MemoryHook::
 overflow_heap_size() {
+#ifdef DO_MEMORY_USAGE
   _max_heap_size = ~(size_t)0;
-}
 #endif  // DO_MEMORY_USAGE
+}
@@ -67,7 +67,6 @@ class EXPCL_DTOOL MemoryHook {
 
   INLINE static size_t get_ptr_size(void *ptr);
 
-#ifdef DO_MEMORY_USAGE
 protected:
   TVOLATILE AtomicAdjust::Integer _total_heap_single_size;
   TVOLATILE AtomicAdjust::Integer _total_heap_array_size;
@@ -79,15 +78,14 @@ class EXPCL_DTOOL MemoryHook {
   size_t _max_heap_size;
 
   virtual void overflow_heap_size();
-#endif  // DO_MEMORY_USAGE
 
 private:
   size_t _page_size;
 
   typedef map<size_t, DeletedBufferChain *> DeletedChains;
   DeletedChains _deleted_chains;
 
-  MutexImpl _lock;
+  mutable MutexImpl _lock;
 };
 
 #include "memoryHook.I"
 
@@ -26,9 +26,7 @@ TypeRegistryNode(TypeHandle handle, const string &name, TypeHandle &ref) :
   _handle(handle), _name(name), _ref(ref)
 {
   clear_subtree();
-#ifdef DO_MEMORY_USAGE
   memset(_memory_usage, 0, sizeof(_memory_usage));
-#endif
 }
 
 /**
 
@@ -47,9 +47,7 @@ class EXPCL_DTOOL TypeRegistryNode {
   Classes _parent_classes;
   Classes _child_classes;
 
-#ifdef DO_MEMORY_USAGE
   AtomicAdjust::Integer _memory_usage[TypeHandle::MC_limit];
-#endif
 
   static bool _paranoid_inheritance;
 
 
@@ -75,6 +75,9 @@ class MemoryInfo {
 
 #include "memoryInfo.I"
 
+#else
+class MemoryInfo;
+
 #endif  // DO_MEMORY_USAGE
 
 #endif
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,7 @@ TypeRegistryNode(TypeHandle handle, const string &name, TypeHandle &ref) :`
`26`	`26`	`_handle(handle), _name(name), _ref(ref)`
`27`	`27`	`{`
`28`	`28`	`clear_subtree();`
`29`		`-#ifdef DO_MEMORY_USAGE`
`30`	`29`	`memset(_memory_usage, 0, sizeof(_memory_usage));`
`31`		`-#endif`
`32`	`30`	`}`
`33`	`31`
`34`	`32`	`/**`