diff options
| author | lloyd <[email protected]> | 2010-10-13 03:34:49 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-13 03:34:49 +0000 |
| commit | fcd3aba1ff6b8597b31165474573dbb339479c14 (patch) | |
| tree | f78d39b6d30c91139cb8f47be580e1c648e50c17 | |
| parent | ba142ed2eaa21445d49cbbc8ae3b3d4dc625b9d7 (diff) | |
Post-merge fixups
| -rw-r--r-- | src/engine/dyn_engine/dyn_engine.cpp | 2 | ||||
| -rw-r--r-- | src/hash/tiger/tiger.cpp | 2 | ||||
| -rw-r--r-- | src/pubkey/rsa/rsa.cpp | 1 | ||||
| -rw-r--r-- | src/utils/parsing.h | 11 |
4 files changed, 5 insertions, 11 deletions
diff --git a/src/engine/dyn_engine/dyn_engine.cpp b/src/engine/dyn_engine/dyn_engine.cpp index 83169f431..f48f1a06d 100644 --- a/src/engine/dyn_engine/dyn_engine.cpp +++ b/src/engine/dyn_engine/dyn_engine.cpp @@ -35,7 +35,7 @@ Dynamically_Loaded_Engine::Dynamically_Loaded_Engine( if(mod_version != 20100908) throw std::runtime_error("Incompatible version in " + library_path + " of " + - to_string(mod_version)); + std::to_string(mod_version)); creator_func creator = lib->resolve<creator_func>("create_engine"); diff --git a/src/hash/tiger/tiger.cpp b/src/hash/tiger/tiger.cpp index 95d870857..32189952a 100644 --- a/src/hash/tiger/tiger.cpp +++ b/src/hash/tiger/tiger.cpp @@ -161,7 +161,7 @@ void Tiger::clear() std::string Tiger::name() const { return "Tiger(" + std::to_string(output_length()) + "," + - to_string(PASS) + ")"; + std::to_string(PASS) + ")"; } /* diff --git a/src/pubkey/rsa/rsa.cpp b/src/pubkey/rsa/rsa.cpp index ebc06ddb7..2da366699 100644 --- a/src/pubkey/rsa/rsa.cpp +++ b/src/pubkey/rsa/rsa.cpp @@ -10,6 +10,7 @@ #include <botan/parsing.h> #include <botan/numthry.h> #include <botan/keypair.h> +#include <botan/internal/assert.h> #include <future> namespace Botan { diff --git a/src/utils/parsing.h b/src/utils/parsing.h index 12370bf2b..98dcd82b5 100644 --- a/src/utils/parsing.h +++ b/src/utils/parsing.h @@ -48,19 +48,12 @@ BOTAN_DLL bool x500_name_cmp(const std::string& name1, const std::string& name2); /** -* Convert a number to a string -* @param n the integer to convert to a string -* @param min_len the min length of the output string -* @return n convert to a string -*/ -BOTAN_DLL std::string to_string(u64bit n, size_t min_len = 0); - -/** * Convert a string to a number * @param str the string to convert * @return number value of the string */ -BOTAN_DLL u32bit to_u32bit(const std::string& str); +inline u32bit to_u32bit(const std::string& str) + { return std::stoul(str); } /** * Convert a time specification to a number |