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.cpp | |
| 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.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index cd9feeca62b..a5062c4e20b 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -949,8 +949,8 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _batchAutoFlushSize(0), _collectObjects(false), _implicitContext(0), - _stringConverter(IceUtil::getProcessStringConverter()), - _wstringConverter(IceUtil::getProcessWstringConverter()), + _stringConverter(Ice::getProcessStringConverter()), + _wstringConverter(Ice::getProcessWstringConverter()), _adminEnabled(false) { try @@ -1343,9 +1343,9 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica // // Reset _stringConverter and _wstringConverter, in case a plugin changed them // - _stringConverter = IceUtil::getProcessStringConverter(); + _stringConverter = Ice::getProcessStringConverter(); - IceUtil::WstringConverterPtr newWstringConverter = IceUtil::getProcessWstringConverter(); + Ice::WstringConverterPtr newWstringConverter = Ice::getProcessWstringConverter(); if(newWstringConverter) { _wstringConverter = newWstringConverter; |