diff options
author | lloyd <[email protected]> | 2010-08-13 15:13:21 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-08-13 15:13:21 +0000 |
commit | 3da3b04e1ba1577b3d0e1b4b9b3f4b24381fc433 (patch) | |
tree | 8a4b3a3b8e830ffcbd41f41859db4ab4fd972fb2 /src/block | |
parent | 2cae6ec17984ad016f973d5925860278e575b3f4 (diff) | |
parent | 789cee0888bbede838a2a3cf6221677c9f172872 (diff) |
propagate from branch 'net.randombit.botan' (head 0a3348f52bf558bc2282e1066c2913a72a1aeda5)
to branch 'net.randombit.botan.c++0x' (head 552c20ae8874f12da779fc25ea368e36e71cbfe8)
Diffstat (limited to 'src/block')
-rw-r--r-- | src/block/lion/lion.cpp | 2 | ||||
-rw-r--r-- | src/block/misty1/misty1.cpp | 2 | ||||
-rw-r--r-- | src/block/rc5/rc5.cpp | 2 | ||||
-rw-r--r-- | src/block/safer/safer_sk.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/block/lion/lion.cpp b/src/block/lion/lion.cpp index d8dfd1fcb..cfb1406d7 100644 --- a/src/block/lion/lion.cpp +++ b/src/block/lion/lion.cpp @@ -81,7 +81,7 @@ std::string Lion::name() const { return "Lion(" + hash->name() + "," + cipher->name() + "," + - to_string(BLOCK_SIZE) + ")"; + std::to_string(BLOCK_SIZE) + ")"; } /* diff --git a/src/block/misty1/misty1.cpp b/src/block/misty1/misty1.cpp index 9ab4d11f4..bc85d71f9 100644 --- a/src/block/misty1/misty1.cpp +++ b/src/block/misty1/misty1.cpp @@ -255,7 +255,7 @@ MISTY1::MISTY1(u32bit rounds) : BlockCipher(8, 16) { if(rounds != 8) throw Invalid_Argument("MISTY1: Invalid number of rounds: " - + to_string(rounds)); + + std::to_string(rounds)); } } diff --git a/src/block/rc5/rc5.cpp b/src/block/rc5/rc5.cpp index dcda1bb25..6c712db9a 100644 --- a/src/block/rc5/rc5.cpp +++ b/src/block/rc5/rc5.cpp @@ -99,7 +99,7 @@ void RC5::key_schedule(const byte key[], u32bit length) */ std::string RC5::name() const { - return "RC5(" + to_string(ROUNDS) + ")"; + return "RC5(" + std::to_string(ROUNDS) + ")"; } /* diff --git a/src/block/safer/safer_sk.cpp b/src/block/safer/safer_sk.cpp index 74e7b6298..84ad9523b 100644 --- a/src/block/safer/safer_sk.cpp +++ b/src/block/safer/safer_sk.cpp @@ -112,7 +112,7 @@ void SAFER_SK::key_schedule(const byte key[], u32bit) */ std::string SAFER_SK::name() const { - return "SAFER-SK(" + to_string(ROUNDS) + ")"; + return "SAFER-SK(" + std::to_string(ROUNDS) + ")"; } /* |