diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-01 10:09:48 -0400 |
| commit | 4aa7ae5129a9cb66f5ea26165310e96603af576c (patch) | |
| tree | f8ee6859ad547b59cc28eadb1212f403f51dfff7 /cpp/include/Ice/InputStream.h | |
| parent | Do not initialize OpenSSL locks if already done by other library. (diff) | |
| download | ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.bz2 ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.tar.xz ice-4aa7ae5129a9cb66f5ea26165310e96603af576c.zip | |
Move StringConverter API to namespace Ice
Diffstat (limited to 'cpp/include/Ice/InputStream.h')
| -rw-r--r-- | cpp/include/Ice/InputStream.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/Ice/InputStream.h b/cpp/include/Ice/InputStream.h index a79e0a46411..bb563ab8fff 100644 --- a/cpp/include/Ice/InputStream.h +++ b/cpp/include/Ice/InputStream.h @@ -10,7 +10,7 @@ #ifndef ICE_INPUT_STREAM_H #define ICE_INPUT_STREAM_H -#include <IceUtil/StringConverter.h> +#include <Ice/StringConverter.h> #include <Ice/CommunicatorF.h> #include <Ice/InstanceF.h> #include <Ice/Object.h> @@ -121,7 +121,7 @@ public: // IceInternal::Instance* instance() const { return _instance; } // Inlined for performance reasons. - void setStringConverters(const IceUtil::StringConverterPtr&, const IceUtil::WstringConverterPtr&); + void setStringConverters(const StringConverterPtr&, const WstringConverterPtr&); void setValueFactoryManager(const ValueFactoryManagerPtr&); @@ -964,8 +964,8 @@ private: int _startSeq; int _minSeqSize; - IceUtil::StringConverterPtr _stringConverter; - IceUtil::WstringConverterPtr _wstringConverter; + StringConverterPtr _stringConverter; + WstringConverterPtr _wstringConverter; ValueFactoryManagerPtr _valueFactoryManager; LoggerPtr _logger; #ifdef ICE_CPP11_MAPPING |