Changeset e71890 for molecuilder/src/memoryusageobserver.cpp

Timestamp:

Oct 9, 2009, 12:30:54 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

104cf4

Parents:

3efb4a (diff), 682229 (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.

git-author:

Frederik Heber <heber@…> (10/09/09 12:18:41)

git-committer:

Frederik Heber <heber@…> (10/09/09 12:30:54)

Message:

Merge branch 'new-delete-conversion' into CodeRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/helpers.cpp
molecuilder/src/helpers.hpp
molecuilder/src/memoryusageobserver.cpp

• FIX: performCriticalExit() was declared static but not defined a such.
• Merge was basically only due to libmolecuilder which was not used in CodeRefactoring branch before.
• added ActOnAll Unit test to new unittests sub folder and to Makefile.am

File:

• molecuilder/src/memoryusageobserver.cpp (modified) (1 diff)

molecuilder/src/memoryusageobserver.cpp

@@ -108 +108 @@
   return maximumSize;
 }
+
+/**
+ * Gets a map with pointers to the currently allocated memory ranges as keys and
+ * the allocated size as value.
+ */
+map<void*, size_t> MemoryUsageObserver::getPointersToAllocatedMemory() {
+  return memoryUsers;
+}