diff options
| author | lloyd <[email protected]> | 2010-05-19 14:06:59 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-05-19 14:06:59 +0000 |
| commit | 2295ef9e8d97065ad2920f5039878728e52a144f (patch) | |
| tree | 8776271409e706f5d2695d6ec05f8fbd3680e4ef /src/alloc/system_alloc/defalloc.h | |
| parent | 4cace3ee04ae9a20a57b1fa11447a1917f0f155d (diff) | |
| parent | b724994a7385e4ddd2e4e0684383302271ea2bf9 (diff) | |
propagate from branch 'net.randombit.botan' (head 66b216669d7ac91303378281d760236153955ae4)
to branch 'net.randombit.botan.c++0x' (head b911a76971563afcde85935a44a43248a3f5b4a6)
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); |