diff options
| author | lloyd <[email protected]> | 2011-06-13 17:06:08 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-06-13 17:06:08 +0000 |
| commit | 5fcdf6953ed820a446862702311221c10ae0b91d (patch) | |
| tree | 10354a54bb8ef5c8f9c6cdd9fa0142ab0037c635 /src/engine | |
| parent | b145e593616e83a4c124bba70d451ef0f03c5f3f (diff) | |
| parent | 1a28f7ef6064041955e7a662c5e087bbea03b6ad (diff) | |
propagate from branch 'net.randombit.botan' (head 150bd11dd8090559ee1e83394b8283bf93a018de)
to branch 'net.randombit.botan.c++0x' (head 7480693bb3f1e8a4e039a3e7ba3d9a7007f9730e)
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) + ")"; } /* |