Add tests for reserve and fix bug in memoryusage accounting.

2 files changed, 10 insertions, 10 deletions

diff --git a/vespalib/src/vespa/vespalib/util/generationholder.cpp b/vespalib/src/vespa/vespalib/util/generationholder.cpp
index 047c9676bb4..d8f36793938 100644
--- a/vespalib/src/vespa/vespalib/util/generationholder.cpp
+++ b/vespalib/src/vespa/vespalib/util/generationholder.cpp
@@ -4,7 +4,7 @@
 
 namespace vespalib {
 
-GenerationHeldBase::~GenerationHeldBase(void)
+GenerationHeldBase::~GenerationHeldBase()
 {
 }
 
@@ -14,19 +14,19 @@ GenerationHeldMalloc::GenerationHeldMalloc(size_t size, void *data)
 {
 }
 
-GenerationHeldMalloc::~GenerationHeldMalloc(void)
+GenerationHeldMalloc::~GenerationHeldMalloc()
 {
     free(_data);
 };
 
-GenerationHolder::GenerationHolder(void)
+GenerationHolder::GenerationHolder()
     : _hold1List(),
       _hold2List(),
       _heldBytes(0)
 {
 }
 
-GenerationHolder::~GenerationHolder(void)
+GenerationHolder::~GenerationHolder()
 {
     assert(_hold1List.empty());
     assert(_hold2List.empty());
@@ -69,7 +69,7 @@ GenerationHolder::trimHoldListsSlow(generation_t usedGen)
 }
 
 void
-GenerationHolder::clearHoldLists(void)
+GenerationHolder::clearHoldLists()
 {
     _hold1List.clear();
     _hold2List.clear();
diff --git a/vespalib/src/vespa/vespalib/util/generationholder.h b/vespalib/src/vespa/vespalib/util/generationholder.h
index 557104e2687..b4c8fa8a541 100644
--- a/vespalib/src/vespa/vespalib/util/generationholder.h
+++ b/vespalib/src/vespa/vespalib/util/generationholder.h
@@ -63,7 +63,7 @@ private:
 
     HoldList _hold1List;
     HoldList _hold2List;
-    size_t _heldBytes;
+    size_t   _heldBytes;
 
     /**
      * Transfer holds from hold1 to hold2 lists, assigning generation.
@@ -76,8 +76,8 @@ private:
     void trimHoldListsSlow(generation_t usedGen);
 
 public:
-    GenerationHolder(void);
-    ~GenerationHolder(void);
+    GenerationHolder();
+    ~GenerationHolder();
 
     /**
      * Add the given data pointer to this holder.
@@ -102,8 +102,8 @@ public:
         }
     }
 
-    void clearHoldLists(void);
-    size_t getHeldBytes(void) const { return _heldBytes; }
+    void clearHoldLists();
+    size_t getHeldBytes() const { return _heldBytes; }
 };
 
 }