diff options
Diffstat (limited to 'vespalib')
-rw-r--r-- | vespalib/src/vespa/vespalib/util/generationholder.cpp | 18 | ||||
-rw-r--r-- | vespalib/src/vespa/vespalib/util/generationholder.h | 14 |
2 files changed, 4 insertions, 28 deletions
diff --git a/vespalib/src/vespa/vespalib/util/generationholder.cpp b/vespalib/src/vespa/vespalib/util/generationholder.cpp index d8f36793938..a33ba5e0cec 100644 --- a/vespalib/src/vespa/vespalib/util/generationholder.cpp +++ b/vespalib/src/vespa/vespalib/util/generationholder.cpp @@ -4,27 +4,13 @@ namespace vespalib { -GenerationHeldBase::~GenerationHeldBase() -{ -} - -GenerationHeldMalloc::GenerationHeldMalloc(size_t size, void *data) - : GenerationHeldBase(size), - _data(data) -{ -} - -GenerationHeldMalloc::~GenerationHeldMalloc() -{ - free(_data); -}; +GenerationHeldBase::~GenerationHeldBase() { } GenerationHolder::GenerationHolder() : _hold1List(), _hold2List(), _heldBytes(0) -{ -} +{ } GenerationHolder::~GenerationHolder() { diff --git a/vespalib/src/vespa/vespalib/util/generationholder.h b/vespalib/src/vespa/vespalib/util/generationholder.h index b4c8fa8a541..33aad9c3f88 100644 --- a/vespalib/src/vespa/vespalib/util/generationholder.h +++ b/vespalib/src/vespa/vespalib/util/generationholder.h @@ -25,18 +25,8 @@ public: _size(size) { } - virtual ~GenerationHeldBase(void); - size_t getSize(void) const { return _size; } -}; - -class GenerationHeldMalloc : public GenerationHeldBase -{ - void *_data; - -public: - GenerationHeldMalloc(size_t size, void *data); - - virtual ~GenerationHeldMalloc(void); + virtual ~GenerationHeldBase(); + size_t getSize() const { return _size; } }; template<typename A> |