diff options
| author | lloyd <[email protected]> | 2009-12-16 22:54:39 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-16 22:54:39 +0000 |
| commit | 1d595f8976483078c292e365bde3949c9de26332 (patch) | |
| tree | 874f7cb1b2ba23405bc69330e6233eb567bf2ec4 /src/alloc/system_alloc/defalloc.h | |
| parent | f3f36611db8c3f6c67c818d454973a0165b0fcf2 (diff) | |
| parent | 85b961ff87c1d6300451538c939c99a2ff74b505 (diff) | |
propagate from branch 'net.randombit.botan' (head 22c82e10d78ad0e2cdaa56cb02f3d846ed0ead5e)
to branch 'net.randombit.botan.c++0x' (head 74dbf310b7fcc11f94a16cd63046219acd5d62bc)
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); |