aboutsummaryrefslogtreecommitdiffstats
path: root/src/utils/charset.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-12-24 22:19:09 +0000
committerlloyd <[email protected]>2009-12-24 22:19:09 +0000
commit72aaefc3ae5211e5cbd74520ec58c0bfb172f860 (patch)
treeb1b31afa932fcbe77f900ff8e48f8e8fa72907b4 /src/utils/charset.cpp
parentab35e8266cb93df950c0f93a74f9714d9de40f1c (diff)
parent75234461be7187b1582cd80134e6d6aaeee82c3e (diff)
propagate from branch 'net.randombit.botan' (head 775a8de3f880cdc75105b4fa607bcc25bd3a99d1)
to branch 'net.randombit.botan.c++0x' (head b88067c1db54346de91f4930a7cf435609c557c0)
Diffstat (limited to 'src/utils/charset.cpp')
-rw-r--r--src/utils/charset.cpp2
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));
}
/*