diff options
author | lloyd <[email protected]> | 2009-12-22 04:50:18 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2009-12-22 04:50:18 +0000 |
commit | c85c79ac51b5829258dae7e51bb472b740da9574 (patch) | |
tree | d02818ecdf25c028ead796c2a06bc10ac596924f /src/libstate/libstate.h | |
parent | c2c896ee870285b836f80b30a042941b03ddd440 (diff) | |
parent | 93e8fd697d009dfef3b994a77936cbf88d2d2ba3 (diff) |
propagate from branch 'net.randombit.botan' (head 5525439539abc808b7b8588380a362303cf3c599)
to branch 'net.randombit.botan.c++0x' (head 6749468bfbdeff4636b7a15de412a6c89f1aea87)
Diffstat (limited to 'src/libstate/libstate.h')
-rw-r--r-- | src/libstate/libstate.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/src/libstate/libstate.h b/src/libstate/libstate.h index a0421953e..e9a08b74b 100644 --- a/src/libstate/libstate.h +++ b/src/libstate/libstate.h @@ -12,6 +12,7 @@ #include <botan/allocate.h> #include <botan/algo_factory.h> +#include <mutex> #include <string> #include <vector> #include <map> @@ -27,11 +28,14 @@ class BOTAN_DLL Library_State Library_State(); ~Library_State(); - void initialize(bool thread_safe); + Library_State(const Library_State&) = delete; + Library_State& operator=(const Library_State&) = delete; + + void initialize(); Algorithm_Factory& algorithm_factory(); - Allocator* get_allocator(const std::string& = "") const; + Allocator* get_allocator(const std::string& = ""); void add_allocator(Allocator*); void set_default_allocator(const std::string&); @@ -42,7 +46,7 @@ class BOTAN_DLL Library_State * @result the value of the parameter */ std::string get(const std::string& section, - const std::string& key) const; + const std::string& key); /** * Check whether a certain parameter is set @@ -52,7 +56,7 @@ class BOTAN_DLL Library_State * @result true if the parameters value is set, * false otherwise */ - bool is_set(const std::string& section, const std::string& key) const; + bool is_set(const std::string& section, const std::string& key); /** * Set a configuration parameter. @@ -70,7 +74,7 @@ class BOTAN_DLL Library_State * referred to as option). * @param key the desired keys name */ - std::string option(const std::string& key) const; + std::string option(const std::string& key); /** * Set an option. @@ -91,21 +95,14 @@ class BOTAN_DLL Library_State * @param alias the alias to resolve. * @return what the alias stands for */ - std::string deref_alias(const std::string&) const; - - class Mutex* get_mutex() const; + std::string deref_alias(const std::string&); private: void load_default_config(); - Library_State(const Library_State&) {} - Library_State& operator=(const Library_State&) { return (*this); } - - class Mutex_Factory* mutex_factory; - + std::mutex config_lock; std::map<std::string, std::string> config; - class Mutex* config_lock; - class Mutex* allocator_lock; + std::mutex allocator_lock; std::map<std::string, Allocator*> alloc_factory; mutable Allocator* cached_default_allocator; std::vector<Allocator*> allocators; |