diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-04-18 17:58:23 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-04-18 17:58:23 -0400 |
| commit | cb11f5d824675f9b5aa4e24aef5b0b15daa66385 (patch) | |
| tree | f2e8582394a2524dd08910c5eb7812d28ed78f0d /cpp/src/Ice/StringConverter.cpp | |
| parent | Merge branch 'master' of cvs:/home/git/ice (diff) | |
| download | ice-cb11f5d824675f9b5aa4e24aef5b0b15daa66385.tar.bz2 ice-cb11f5d824675f9b5aa4e24aef5b0b15daa66385.tar.xz ice-cb11f5d824675f9b5aa4e24aef5b0b15daa66385.zip | |
Fixed bug #2992
Diffstat (limited to 'cpp/src/Ice/StringConverter.cpp')
| -rw-r--r-- | cpp/src/Ice/StringConverter.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/cpp/src/Ice/StringConverter.cpp b/cpp/src/Ice/StringConverter.cpp index 1e750a88e1d..e9b6068b9ba 100644 --- a/cpp/src/Ice/StringConverter.cpp +++ b/cpp/src/Ice/StringConverter.cpp @@ -20,6 +20,11 @@ using namespace std; namespace Ice { +UnicodeWstringConverter::UnicodeWstringConverter(ConversionFlags flags) : + _conversionFlags(flags) +{ +} + Byte* UnicodeWstringConverter::toUTF8(const wchar_t* sourceStart, const wchar_t* sourceEnd, @@ -38,7 +43,7 @@ UnicodeWstringConverter::toUTF8(const wchar_t* sourceStart, while((result = convertUTFWstringToUTF8(sourceStart, sourceEnd, - targetStart, targetEnd, lenientConversion)) + targetStart, targetEnd, _conversionFlags)) == targetExhausted) { targetStart = buffer.getMoreBytes(chunkSize, targetStart); @@ -74,7 +79,7 @@ UnicodeWstringConverter::fromUTF8(const Byte* sourceStart, const Byte* sourceEnd } ConversionResult result = - convertUTF8ToUTFWstring(sourceStart, sourceEnd, target, lenientConversion); + convertUTF8ToUTFWstring(sourceStart, sourceEnd, target, _conversionFlags); switch(result) { |