diff options
| author | lloyd <[email protected]> | 2011-07-12 11:52:39 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-07-12 11:52:39 +0000 |
| commit | 9e84dbf6c6ee9297f2a707f49d1cf175b6e149a5 (patch) | |
| tree | e93fc28388c762d11bae0a52edcc17576a2ae1f6 /src/block | |
| parent | 82e218500e6f305d02feecc000b43a5d9448e11a (diff) | |
| parent | dcc7e959eff557811c3cf414adde096285821816 (diff) | |
propagate from branch 'net.randombit.botan' (head 23a326fa36a31dd39347a8864e1f5740669a905e)
to branch 'net.randombit.botan.cxx11' (head 9d3ac8dd45f7673c85dca41968e7750acc90bdff)
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 | 4 | ||||
| -rw-r--r-- | src/block/safer/safer_sk.cpp | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/block/lion/lion.cpp b/src/block/lion/lion.cpp index 46308e428..8c39eee65 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 36c25a814..77d1047b1 100644 --- a/src/block/misty1/misty1.cpp +++ b/src/block/misty1/misty1.cpp @@ -255,7 +255,7 @@ MISTY1::MISTY1(size_t rounds) : 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 cfcc4cb64..981f73564 100644 --- a/src/block/rc5/rc5.cpp +++ b/src/block/rc5/rc5.cpp @@ -116,7 +116,7 @@ void RC5::key_schedule(const byte key[], size_t length) */ std::string RC5::name() const { - return "RC5(" + to_string(get_rounds()) + ")"; + return "RC5(" + std::to_string(get_rounds()) + ")"; } /* @@ -126,7 +126,7 @@ RC5::RC5(size_t rounds) { if(rounds < 8 || rounds > 32 || (rounds % 4 != 0)) throw Invalid_Argument("RC5: Invalid number of rounds " + - to_string(rounds)); + std::to_string(rounds)); S.resize(2*rounds + 2); } diff --git a/src/block/safer/safer_sk.cpp b/src/block/safer/safer_sk.cpp index a3a6cefd8..5275a0781 100644 --- a/src/block/safer/safer_sk.cpp +++ b/src/block/safer/safer_sk.cpp @@ -230,7 +230,7 @@ void SAFER_SK::key_schedule(const byte key[], size_t) */ std::string SAFER_SK::name() const { - return "SAFER-SK(" + to_string(get_rounds()) + ")"; + return "SAFER-SK(" + std::to_string(get_rounds()) + ")"; } /* |