diff options
| author | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-05-02 19:56:38 +0200 |
| commit | 1161c5817059464ab511632c0ce5d14593ced1a3 (patch) | |
| tree | 51bbcdf2a4ea43c430312157350bb4271bc3f40d /cpp/include/Ice/BasicStream.h | |
| parent | Update .gitignore files (diff) | |
| download | ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.bz2 ice-1161c5817059464ab511632c0ce5d14593ced1a3.tar.xz ice-1161c5817059464ab511632c0ce5d14593ced1a3.zip | |
ICE-4851 - Use wstrings for input and output data that contain non-ASCII characters?
Diffstat (limited to 'cpp/include/Ice/BasicStream.h')
| -rw-r--r-- | cpp/include/Ice/BasicStream.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h index 3f546fd52a8..bd18dbf7b8a 100644 --- a/cpp/include/Ice/BasicStream.h +++ b/cpp/include/Ice/BasicStream.h @@ -10,6 +10,7 @@ #ifndef ICE_BASIC_STREAM_H #define ICE_BASIC_STREAM_H +#include <IceUtil/StringConverter.h> #include <Ice/InstanceF.h> #include <Ice/Object.h> #include <Ice/ProxyF.h> @@ -27,14 +28,6 @@ namespace Ice class UserException; -template<typename charT> class BasicStringConverter; - -typedef BasicStringConverter<char> StringConverter; -typedef IceUtil::Handle<StringConverter> StringConverterPtr; - -typedef BasicStringConverter<wchar_t> WstringConverter; -typedef IceUtil::Handle<WstringConverter> WstringConverterPtr; - } namespace IceInternal @@ -1244,8 +1237,8 @@ private: const Container::size_type _messageSizeMax; bool _unlimited; - const Ice::StringConverterPtr& _stringConverter; - const Ice::WstringConverterPtr& _wstringConverter; + const IceUtil::StringConverterPtr _stringConverter; + const IceUtil::WstringConverterPtr _wstringConverter; int _startSeq; int _minSeqSize; |