diff options
| author | lloyd <[email protected]> | 2009-11-17 07:20:51 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-17 07:20:51 +0000 |
| commit | 7a24783fd58b21e1ea59615025806663e5f231eb (patch) | |
| tree | b77c685e0b54f82890947009631461bcfe5b6880 /src/alloc/system_alloc/defalloc.h | |
| parent | e00b46cf9c1dcb364ebb7d5968d6ff9dcd600c4e (diff) | |
| parent | 471847e2148776e62e4f580ade95572fc525c751 (diff) | |
propagate from branch 'net.randombit.botan' (head 0ac5a29496b4e50775827d9655c064f6d1c98813)
to branch 'net.randombit.botan.c++0x' (head 3232da044d41756582b53da9d14c3ac07e9b2916)
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); |