diff options
| author | lloyd <[email protected]> | 2009-12-16 02:52:12 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-12-16 02:52:12 +0000 |
| commit | 317b76d71dca1840c9e72f9a26407590719c1423 (patch) | |
| tree | 2eb49072e6e27f6ee41e704004aa8689b1e98bb3 /src/alloc/mem_pool | |
| parent | 457ce43934a4e51ead4d21e43013eef9d448d0e1 (diff) | |
| parent | 12afeca214c4414a0ced0bc4654d0fc5908dc77b (diff) | |
propagate from branch 'net.randombit.botan' (head 744dccf92270cf16b80b50ee2759424c9866b256)
to branch 'net.randombit.botan.c++0x' (head 2aa1acac1d05e8ea9991fe39015b1db9abc3b24e)
Diffstat (limited to 'src/alloc/mem_pool')
| -rw-r--r-- | src/alloc/mem_pool/info.txt | 8 | ||||
| -rw-r--r-- | src/alloc/mem_pool/mem_pool.cpp | 4 | ||||
| -rw-r--r-- | src/alloc/mem_pool/mem_pool.h | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/alloc/mem_pool/info.txt b/src/alloc/mem_pool/info.txt index b57a8b647..f87ea4c4c 100644 --- a/src/alloc/mem_pool/info.txt +++ b/src/alloc/mem_pool/info.txt @@ -1,6 +1,8 @@ -load_on auto -<add> +<source> mem_pool.cpp +</source> + +<header:internal> mem_pool.h -</add> +</header:internal> diff --git a/src/alloc/mem_pool/mem_pool.cpp b/src/alloc/mem_pool/mem_pool.cpp index 820355678..031cc2656 100644 --- a/src/alloc/mem_pool/mem_pool.cpp +++ b/src/alloc/mem_pool/mem_pool.cpp @@ -7,8 +7,8 @@ * Distributed under the terms of the Botan license */ -#include <botan/mem_pool.h> -#include <botan/rounding.h> +#include <botan/internal/mem_pool.h> +#include <botan/internal/rounding.h> #include <botan/mem_ops.h> #include <algorithm> #include <exception> diff --git a/src/alloc/mem_pool/mem_pool.h b/src/alloc/mem_pool/mem_pool.h index dd463d908..f0a564965 100644 --- a/src/alloc/mem_pool/mem_pool.h +++ b/src/alloc/mem_pool/mem_pool.h @@ -19,7 +19,7 @@ namespace Botan { /* * Pooling Allocator */ -class BOTAN_DLL Pooling_Allocator : public Allocator +class Pooling_Allocator : public Allocator { public: void* allocate(u32bit); @@ -36,7 +36,7 @@ class BOTAN_DLL Pooling_Allocator : public Allocator virtual void* alloc_block(u32bit) = 0; virtual void dealloc_block(void*, u32bit) = 0; - class BOTAN_DLL Memory_Block + class Memory_Block { public: Memory_Block(void*); |