diff options
| author | lloyd <[email protected]> | 2010-03-12 14:24:21 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-03-12 14:24:21 +0000 |
| commit | 6a8c00e903ea63828319460133a651c410b86185 (patch) | |
| tree | e74eada5d4a1a23b3568c8e77496653729020c4e /src/alloc/system_alloc/defalloc.h | |
| parent | 47ad59e19b11b1f7ea4d15d86408d3ca675cd369 (diff) | |
| parent | c8e8fdab5f0253f5143ab9eb1a250ad69ffc4420 (diff) | |
propagate from branch 'net.randombit.botan' (head 0b404c8dc611e8cf8fec60cdcaffa823b925d09a)
to branch 'net.randombit.botan.c++0x' (head 60585d4c6a816c4d6a0ce269b63c1e28ec04e0de)
Diffstat (limited to 'src/alloc/system_alloc/defalloc.h')
| -rw-r--r-- | src/alloc/system_alloc/defalloc.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/alloc/system_alloc/defalloc.h b/src/alloc/system_alloc/defalloc.h index 0c8804223..436549540 100644 --- a/src/alloc/system_alloc/defalloc.h +++ b/src/alloc/system_alloc/defalloc.h @@ -30,8 +30,6 @@ class Malloc_Allocator : public Allocator class Locking_Allocator : public Pooling_Allocator { public: - Locking_Allocator(Mutex* m) : Pooling_Allocator(m) {} - std::string type() const { return "locking"; } private: void* alloc_block(u32bit); |