aboutsummaryrefslogtreecommitdiffstats
path: root/src/alloc/mem_pool/mem_pool.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-12-22 04:50:18 +0000
committerlloyd <[email protected]>2009-12-22 04:50:18 +0000
commitc85c79ac51b5829258dae7e51bb472b740da9574 (patch)
treed02818ecdf25c028ead796c2a06bc10ac596924f /src/alloc/mem_pool/mem_pool.h
parentc2c896ee870285b836f80b30a042941b03ddd440 (diff)
parent93e8fd697d009dfef3b994a77936cbf88d2d2ba3 (diff)
propagate from branch 'net.randombit.botan' (head 5525439539abc808b7b8588380a362303cf3c599)
to branch 'net.randombit.botan.c++0x' (head 6749468bfbdeff4636b7a15de412a6c89f1aea87)
Diffstat (limited to 'src/alloc/mem_pool/mem_pool.h')
-rw-r--r--src/alloc/mem_pool/mem_pool.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/alloc/mem_pool/mem_pool.h b/src/alloc/mem_pool/mem_pool.h
index 9735a547d..f0a564965 100644
--- a/src/alloc/mem_pool/mem_pool.h
+++ b/src/alloc/mem_pool/mem_pool.h
@@ -10,7 +10,7 @@
#include <botan/allocate.h>
#include <botan/exceptn.h>
-#include <botan/internal/mutex.h>
+#include <mutex>
#include <utility>
#include <vector>
@@ -27,7 +27,7 @@ class Pooling_Allocator : public Allocator
void destroy();
- Pooling_Allocator(Mutex*);
+ Pooling_Allocator();
~Pooling_Allocator();
private:
void get_more_core(u32bit);
@@ -66,7 +66,7 @@ class Pooling_Allocator : public Allocator
std::vector<Memory_Block> blocks;
std::vector<Memory_Block>::iterator last_used;
std::vector<std::pair<void*, u32bit> > allocated;
- Mutex* mutex;
+ std::mutex mutex;
};
}