diff options
| author | lloyd <[email protected]> | 2009-11-02 12:12:40 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-02 12:12:40 +0000 |
| commit | b8658279904708d0690e473fb85942d5da23d2fc (patch) | |
| tree | 65528378bd0089287ca0927a13a6e0a012f7bc78 /src/alloc/system_alloc | |
| parent | 6b617a55bd02bcc4fdb6f76af92e0cb65fd838a2 (diff) | |
| parent | 92f31b22dfe2aa1b2bde84cbaf4ce7365fa4ec68 (diff) | |
propagate from branch 'net.randombit.botan' (head 2773c2310e8c0a51975987a2dd6c5824c8d43882)
to branch 'net.randombit.botan.c++0x' (head f13cf5d7e89706c882604299b508f356c20aae3a)
Diffstat (limited to 'src/alloc/system_alloc')
| -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); |