diff options
| author | lloyd <[email protected]> | 2010-02-14 06:18:15 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-02-14 06:18:15 +0000 |
| commit | 7424a5b5102b569e3c052cb195c98b5d1b60ce30 (patch) | |
| tree | 70ab6872b9980969a7dea97bccdcdbb4e4916f7a /src/utils/charset.cpp | |
| parent | 12e07d37e9622cfb24b2102090550a0260c6665c (diff) | |
| parent | 16c3b54220d6e80f713a4d6321deb53a7b1e1fec (diff) | |
propagate from branch 'net.randombit.botan' (head 5bfc3e699003b86615c584f8ae40bd6e761f96c0)
to branch 'net.randombit.botan.c++0x' (head 8c64a107b58d41f376bfffc69dfab4514d722c5c)
Diffstat (limited to 'src/utils/charset.cpp')
| -rw-r--r-- | src/utils/charset.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/utils/charset.cpp b/src/utils/charset.cpp index 53125cad1..e98cf601e 100644 --- a/src/utils/charset.cpp +++ b/src/utils/charset.cpp @@ -119,7 +119,7 @@ std::string transcode(const std::string& str, return ucs2_to_latin1(str); throw Invalid_Argument("Unknown transcoding operation from " + - to_string(from) + " to " + to_string(to)); + std::to_string(from) + " to " + std::to_string(to)); } /* |