diff options
| author | lloyd <[email protected]> | 2011-10-06 15:54:03 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-10-06 15:54:03 +0000 |
| commit | 7939e91a733c8c50706de2fb090fcb60f7f229c8 (patch) | |
| tree | bd9f24eefbae7a49e4832ac728ea83c80da99dc4 /src/engine | |
| parent | ca5581260445e70ed4d038091acb88949b6101ce (diff) | |
| parent | 2877bbc0828a92de94d3628455e92c4298a2ac7d (diff) | |
propagate from branch 'net.randombit.botan' (head 29dfb73a5efec220ebafcb9c1d7a32bb9d63461c)
to branch 'net.randombit.botan.cxx11' (head a842d86b2b9593318fbce5868c3d1278f8b3a037)
Diffstat (limited to 'src/engine')
| -rw-r--r-- | src/engine/dyn_engine/dyn_engine.cpp | 2 | ||||
| -rw-r--r-- | src/engine/openssl/ossl_arc4.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/dyn_engine/dyn_engine.cpp b/src/engine/dyn_engine/dyn_engine.cpp index b76544d0f..2d8dbae3b 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 != 20101003) 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/engine/openssl/ossl_arc4.cpp b/src/engine/openssl/ossl_arc4.cpp index 0b1f7f1f3..799206ce1 100644 --- a/src/engine/openssl/ossl_arc4.cpp +++ b/src/engine/openssl/ossl_arc4.cpp @@ -46,7 +46,7 @@ std::string ARC4_OpenSSL::name() const { if(SKIP == 0) return "ARC4"; if(SKIP == 256) return "MARK-4"; - else return "RC4_skip(" + to_string(SKIP) + ")"; + else return "RC4_skip(" + std::to_string(SKIP) + ")"; } /* |