diff options
| author | lloyd <[email protected]> | 2010-03-13 18:06:31 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-03-13 18:06:31 +0000 |
| commit | 47dbe2b1ab08dad17b157f9ed59767c44256f11d (patch) | |
| tree | 3e664ae407107990519a8865580477aa734d2af3 /src/alloc/system_alloc/defalloc.h | |
| parent | 7859fcfd64579d0539b7d16e7a576f936ccc1f97 (diff) | |
| parent | 6a8c00e903ea63828319460133a651c410b86185 (diff) | |
propagate from branch 'net.randombit.botan' (head 5e9c6107cbb15744c2edf2eb0e23f4bfe949f432)
to branch 'net.randombit.botan.c++0x' (head 79e5920a8bba479b9e5734f8649b8c36d27d403c)
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); |