diff options
| author | lloyd <[email protected]> | 2009-06-04 16:06:59 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-06-04 16:06:59 +0000 |
| commit | 9de911f55808e84e8d14efbecf8379c25afb9d50 (patch) | |
| tree | da2d3825ed58833ae40fc0ffa3e704473aafd0e0 /src/alloc/system_alloc/defalloc.h | |
| parent | a96eae0b3394b64aea544f9f0ce4664d3b4a5c58 (diff) | |
| parent | 3afb86663583b982e1eab8f46d07fc3d51260602 (diff) | |
propagate from branch 'net.randombit.botan' (head 6a746ccf1e957dba703e65372050a7bd4d6b117d)
to branch 'net.randombit.botan.c++0x' (head f54bb7b391eb3b71f380a68ddd460debdc31545d)
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); |