summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2014-05-09 14:30:00 -0400
committerBernard Normier <bernard@zeroc.com>2014-05-09 14:30:00 -0400
commit677ac1b282359e75230d07d311c55e904aef626f (patch)
tree3a512122bac329cb28f1b6f24a668853ffcbf653 /cpp
parentRemoved UTF8ToCodePage helper function in favor of WindowsStringConverter, op... (diff)
downloadice-677ac1b282359e75230d07d311c55e904aef626f.tar.bz2
ice-677ac1b282359e75230d07d311c55e904aef626f.tar.xz
ice-677ac1b282359e75230d07d311c55e904aef626f.zip
Fixed small bug in WindowsStringConverter::fromUTF8 introduced in previous commit
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/IceUtil/StringConverter.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/src/IceUtil/StringConverter.cpp b/cpp/src/IceUtil/StringConverter.cpp
index 8d4ebf5870c..9b4d6e2c8f2 100644
--- a/cpp/src/IceUtil/StringConverter.cpp
+++ b/cpp/src/IceUtil/StringConverter.cpp
@@ -444,7 +444,8 @@ WindowsStringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
if(_cp == CP_UTF8)
{
- target.insert(0, reinterpret_cast<const char*>(sourceStart), sourceEnd - sourceStart);
+ string tmp(reinterpret_cast<const char*>(sourceStart), sourceEnd - sourceStart);
+ tmp.swap(target);
return;
}