diff options
| author | lloyd <[email protected]> | 2009-10-13 16:05:37 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-10-13 16:05:37 +0000 |
| commit | 6f68dc5485ebd41fdef837ab651a47a893d84408 (patch) | |
| tree | 3cda82570052b7bed24df2754c2245479188488a /src/alloc/system_alloc/defalloc.h | |
| parent | 9268a0455a07d31a66364aa5b7594bd75250b466 (diff) | |
| parent | 1b0448fae6652a2da7f0de1fdcd2bbcda9836ca9 (diff) | |
propagate from branch 'net.randombit.botan' (head 139d6957d20f0b1202e0eacc63cb011588faffde)
to branch 'net.randombit.botan.c++0x' (head c16676fa6c393bc3f46a044755ce525a013380a6)
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 627e8df70..ed2682ec0 100644 --- a/src/alloc/system_alloc/defalloc.h +++ b/src/alloc/system_alloc/defalloc.h @@ -30,8 +30,6 @@ class BOTAN_DLL Malloc_Allocator : public Allocator class BOTAN_DLL Locking_Allocator : public Pooling_Allocator { public: - Locking_Allocator(Mutex* m) : Pooling_Allocator(m) {} - std::string type() const { return "locking"; } private: void* alloc_block(u32bit); |