diff options
| author | lloyd <[email protected]> | 2009-11-18 08:54:45 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-18 08:54:45 +0000 |
| commit | 7a62a8c05ddf02073108f4117a80065d2d8ae7ec (patch) | |
| tree | 2d53d3010e2f36951db035d2fe8bb3b8f4a1c6ff /src/block | |
| parent | 6e45f118d112ee55b980a262b8b9ec67e66e9268 (diff) | |
Remove to_string, replacing with std::to_string
Convert to_u32bit to use the new C++0x library func stoul instead of
hand-written code.
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 d8822b9f2..81252f5e3 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 8a92824cc..56cd7446c 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 0bd596b10..1b71de85a 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 eb5c22fc9..fcbe84c8b 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) + ")"; } /* |