Changeset 682229 for molecuilder/src/memoryallocator.hpp

Timestamp:

Oct 9, 2009, 12:08:24 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

e71890

Parents:

89eff5 (diff), afbb6c0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'new-delete-conversion' of ​ssh://adamantium/home/metzler/workspace/espack into new-delete-conversion

File:

• molecuilder/src/memoryallocator.hpp (modified) (1 diff, 1 prop)

molecuilder/src/memoryallocator.hpp

@@ -111 +111 @@
  * \param pointer to the allocated memory range to free; may be NULL, this function is a no-op then
  */
-template <typename X> void Free(X** buffer)
+template <typename X> void Free(X** buffer, const char *msg = NULL)
 {
   if ((buffer == NULL) || (*buffer == NULL))
     return;
 
-  MemoryUsageObserver::getInstance()->removeMemory(*buffer);
+  MemoryUsageObserver::getInstance()->removeMemory(*buffer, msg);
   free(*buffer);
   *buffer = NULL;