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/IceUtil/StringConverter.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/IceUtil/StringConverter.h')
| -rw-r--r-- | cpp/include/IceUtil/StringConverter.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cpp/include/IceUtil/StringConverter.h b/cpp/include/IceUtil/StringConverter.h index 1979107cc67..2f986fb6a06 100644 --- a/cpp/include/IceUtil/StringConverter.h +++ b/cpp/include/IceUtil/StringConverter.h @@ -1,3 +1,6 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved. // // This copy of Ice is licensed to you under the terms described in the // ICE_LICENSE file included in this distribution. @@ -74,14 +77,6 @@ ICE_DEFINE_PTR(WstringConverterPtr, WstringConverter); // ICE_API WstringConverterPtr createUnicodeWstringConverter(); -#ifdef _WIN32 -// -// Create a StringConverter that converts to and from narrow chars -// in the given code page, using MultiByteToWideChar and WideCharToMultiByte -// -ICE_API StringConverterPtr createWindowsStringConverter(unsigned int); -#endif - // // Retrieve the per process narrow string converter. // @@ -160,6 +155,7 @@ ICE_API std::vector<unsigned int> toUTF32(const std::vector<IceUtil::Byte>&); // Convert from UTF-32 to UTF-8 // ICE_API std::vector<IceUtil::Byte> fromUTF32(const std::vector<unsigned int>&); + } #endif |