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/src/Ice/Instance.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/src/Ice/Instance.h')
| -rw-r--r-- | cpp/src/Ice/Instance.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 86d465705bb..659eef3157f 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -15,7 +15,7 @@ #include <IceUtil/Mutex.h> #include <IceUtil/RecMutex.h> #include <IceUtil/Timer.h> -#include <IceUtil/StringConverter.h> +#include <Ice/StringConverter.h> #include <Ice/InstanceF.h> #include <Ice/CommunicatorF.h> #include <Ice/InstrumentationF.h> @@ -135,8 +135,8 @@ public: void setThreadHook(const Ice::ThreadNotificationPtr&); #endif - IceUtil::StringConverterPtr getStringConverter() const { return _stringConverter; } - IceUtil::WstringConverterPtr getWstringConverter() const { return _wstringConverter; } + Ice::StringConverterPtr getStringConverter() const { return _stringConverter; } + Ice::WstringConverterPtr getWstringConverter() const { return _wstringConverter; } BufSizeWarnInfo getBufSizeWarn(Ice::Short type); void setSndBufSizeWarn(Ice::Short type, int size); @@ -198,8 +198,8 @@ private: DynamicLibraryListPtr _dynamicLibraryList; Ice::PluginManagerPtr _pluginManager; const Ice::ImplicitContextIPtr _implicitContext; - IceUtil::StringConverterPtr _stringConverter; - IceUtil::WstringConverterPtr _wstringConverter; + Ice::StringConverterPtr _stringConverter; + Ice::WstringConverterPtr _wstringConverter; bool _adminEnabled; Ice::ObjectAdapterPtr _adminAdapter; Ice::FacetMap _adminFacets; |