diff options
| author | lloyd <[email protected]> | 2010-10-13 03:25:16 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-13 03:25:16 +0000 |
| commit | ba142ed2eaa21445d49cbbc8ae3b3d4dc625b9d7 (patch) | |
| tree | be1a9fa07d0ea26fd7713bb52205f7a3bcc3e907 /src/block | |
| parent | 406d4f8556d41083bfa551e7a777b0cb02925b6c (diff) | |
| parent | 5913bf42b4c32e43d0db11bf9299130f3b0b62a4 (diff) | |
propagate from branch 'net.randombit.botan' (head 2898d79f992f27a328a3e41d34b46eb1052da0de)
to branch 'net.randombit.botan.c++0x' (head 6cba76268fd69a73195760c021b7f881b8a6552c)
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 7f6a06b79..9214044f6 100644 --- a/src/block/lion/lion.cpp +++ b/src/block/lion/lion.cpp @@ -83,7 +83,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 c904c5d78..b87f513a0 100644 --- a/src/block/misty1/misty1.cpp +++ b/src/block/misty1/misty1.cpp @@ -255,7 +255,7 @@ MISTY1::MISTY1(size_t rounds) : BlockCipher(8, 16), EK(100), DK(100) { 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 3cd169e5d..36d4cdd3a 100644 --- a/src/block/rc5/rc5.cpp +++ b/src/block/rc5/rc5.cpp @@ -106,7 +106,7 @@ void RC5::key_schedule(const byte key[], size_t 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 48d96d1a2..5edd9245b 100644 --- a/src/block/safer/safer_sk.cpp +++ b/src/block/safer/safer_sk.cpp @@ -113,7 +113,7 @@ void SAFER_SK::key_schedule(const byte key[], size_t) */ std::string SAFER_SK::name() const { - return "SAFER-SK(" + to_string(ROUNDS) + ")"; + return "SAFER-SK(" + std::to_string(ROUNDS) + ")"; } /* |