Changeset bf497f for molecuilder/src/memoryusageobserver.hpp

Timestamp:

Oct 5, 2009, 2:59:11 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

5dda23, 729279, 8afe31

Parents:

7794d8 (diff), 39d983 (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 'ConcaveHull' of ​ssh://stud64d-02/home/metzler/workspace/espack into ConcaveHull

Conflicts:

molecuilder/src/builder.cpp
molecuilder/src/memoryusageobserver.cpp
molecuilder/src/memoryusageobserver.hpp
molecuilder/src/memoryusageobserverunittest.cpp
molecuilder/src/memoryusageobserverunittest.hpp

This conflict arised, because the #19 commit was already pushed to the server, but the commit was later "amended" locally. This is fixed, there were no real overlaps anyway.

File:

• molecuilder/src/memoryusageobserver.hpp (modified) (2 diffs)

molecuilder/src/memoryusageobserver.hpp

@@ -30 +30 @@
   void removeMemory(void* pointer);
   size_t getUsedMemorySize();
+  size_t getMaximumUsedMemory();
 
 protected:
@@ -40 +41 @@
   static MemoryUsageObserver* instance;
   map<void*, size_t> memoryUsers;
+  size_t totalSize, maximumSize;
 };
 #endif /*MEMORYUSAGEOBSERVER_HPP_*/