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/utils/charset.cpp | |
| 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/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 8e20e6492..7ee637f80 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)); } /* |