zeroc-ice 3.6.5 → 3.7.0

data/ext/ice/cpp/include/IceUtil/PopDisableWarnings.h

@@ -1,19 +1,19 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
 //
 // **********************************************************************
 
-// No pragma once as this file can be included several times in a translation 
+// No pragma once as this file can be included several times in a translation
 // unit
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #   pragma warning(pop)
-#endif
-
-#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+#elif defined(__clang__)
+#   pragma clang diagnostic pop
+#elif defined(__GNUC__)
 #   pragma GCC diagnostic pop
 #endif

data/ext/ice/cpp/include/IceUtil/PushDisableWarnings.h

@@ -1,30 +1,31 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
 //
 // **********************************************************************
 
-// No pragma once as this file can be included several times in a translation 
+// No pragma once as this file can be included several times in a translation
 // unit
 
-#ifdef _MSC_VER
+#if defined(_MSC_VER)
 #   pragma warning(push)
 #   pragma warning(disable:4250) // ... : inherits ... via dominance
 #   pragma warning(disable:4251) // class ... needs to have dll-interface to be used by clients of class ...
 #   pragma warning(disable:4512) //  ... assignment operator could not be generated
 
 #   if _MSC_VER >= 1900
-#       pragma warning(disable:4275) // non dll-interface class ... used as base for dll-interface class ...
+#      pragma warning(disable:4275) // non dll-interface class ... used as base for dll-interface class ...
 #   endif
-#endif
 
-#if defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
-//
-// Expected when using forward Slice declarations
-//
+#elif defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wredundant-decls" // expected when using forward Slice declarations
+
+#elif defined(__GNUC__)
 #   pragma GCC diagnostic push
-#   pragma GCC diagnostic ignored "-Wredundant-decls"
+#   pragma GCC diagnostic ignored "-Wredundant-decls" // expected when using forward Slice declarations
+#   pragma GCC diagnostic ignored "-Wshadow" // expected in some generated header files
 #endif

data/ext/ice/cpp/include/IceUtil/Random.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -16,8 +16,8 @@
 namespace IceUtilInternal
 {
 
-ICE_UTIL_API void generateRandom(char*, size_t);
-ICE_UTIL_API unsigned int random(int = 0);
+ICE_API void generateRandom(char*, size_t);
+ICE_API unsigned int random(int = 0);
 
 }
 

data/ext/ice/cpp/include/IceUtil/RecMutex.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -26,7 +26,7 @@ class Cond;
 //
 // Recursive Mutex implementation.
 //
-class ICE_UTIL_API RecMutex
+class ICE_API RecMutex
 {
 public:
 
@@ -44,7 +44,7 @@ public:
     // Note that lock/tryLock & unlock in general should not be used
     // directly. Instead use Lock & TryLock.
     //
-    
+
     void lock() const;
 
     //
@@ -53,15 +53,14 @@ public:
     //
     bool tryLock() const;
 
-    
     void unlock() const;
 
     //
     // Returns true if the mutex will unlock when calling unlock()
     // (false otherwise). For non-recursive mutexes, this will always
-    // return true. 
-    // This function is used by the Monitor implementation to know whether 
-    // the Mutex has been locked for the first time, or unlocked for the 
+    // return true.
+    // This function is used by the Monitor implementation to know whether
+    // the Mutex has been locked for the first time, or unlocked for the
     // last time (that is another thread is able to acquire the mutex).
     // Pre-condition: the mutex must be locked.
     //
@@ -103,7 +102,7 @@ private:
     mutable CRITICAL_SECTION _mutex;
 #else
     mutable pthread_mutex_t _mutex;
-#endif    
+#endif
 
     mutable int _count;
 };

data/ext/ice/cpp/include/IceUtil/ResourceConfig.h

@@ -0,0 +1,58 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2017 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.
+//
+// **********************************************************************
+
+#ifndef ICE_UTIL_RESOURCE_CONFIG_H
+#define ICE_UTIL_RESOURCE_CONFIG_H
+
+#include "winver.h"
+
+#define ICE_VERSION 3,7,0,0
+#define ICE_STRING_VERSION "3.7.0\0"
+#define ICE_SO_VERSION "37\0"
+#define ICE_COMPANY_NAME "ZeroC, Inc.\0"
+#define ICE_COPYRIGHT "\251 2003-2017 ZeroC, Inc.\0"
+#define ICE_PRODUCT_NAME "Ice\0"
+
+#ifdef ICE_CPP11_MAPPING
+#  if defined(_DEBUG)
+#    if defined(ICE_OS_UWP)
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11D"
+#    else
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11D"
+#    endif
+#  else
+#    if defined(ICE_OS_UWP)
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp++11"
+#    else
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "++11"
+#    endif
+#  endif
+#else
+#  if defined(_DEBUG)
+#    if defined(ICE_OS_UWP)
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwpD"
+#    else
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "D"
+#    endif
+#  else
+#    if defined(ICE_OS_UWP)
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION "uwp"
+#    else
+#      define ICE_LIBNAME(NAME) NAME ICE_SO_VERSION ""
+#    endif
+#  endif
+#endif
+
+#ifndef DEBUG
+#  define VER_DEBUG 0
+#else
+#  define VER_DEBUG VS_FF_DEBUG
+#endif
+
+#endif

data/ext/ice/cpp/include/IceUtil/ScannerConfig.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -33,12 +33,4 @@
 #   pragma clang diagnostic ignored "-Wdeprecated-register"
 #endif
 
-
-//
-// Avoid old style cast warnings in generated scanners
-//
-#ifdef __GNUC__
-#  pragma GCC diagnostic ignored "-Wold-style-cast"
-#endif
-
 #endif

data/ext/ice/cpp/include/IceUtil/ScopedArray.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -12,6 +12,12 @@
 
 #include <IceUtil/Config.h>
 
+#ifndef ICE_CPP11_MAPPING
+
+//
+// Only for the C++98 mapping
+//
+
 namespace IceUtil
 {
 
@@ -60,7 +66,6 @@ public:
         return *this;
     }
 
-
     T& operator[](size_t i) const
     {
         assert(_ptr != 0);
@@ -95,3 +100,4 @@ private:
 } // End of namespace IceUtil
 
 #endif
+#endif

data/ext/ice/cpp/include/IceUtil/Shared.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -31,16 +31,14 @@
 namespace IceUtil
 {
 
-class ICE_UTIL_API SimpleShared
+class ICE_API SimpleShared
 {
 public:
 
     SimpleShared();
     SimpleShared(const SimpleShared&);
 
-    virtual ~SimpleShared()
-    {
-    }
+    virtual ~SimpleShared();
 
     SimpleShared& operator=(const SimpleShared&)
     {
@@ -81,7 +79,7 @@ private:
     bool _noDelete;
 };
 
-class ICE_UTIL_API Shared
+class ICE_API Shared
 {
 public:
 
@@ -122,7 +120,7 @@ public:
     {
         return (_flags & flag) > 0;
     }
-    
+
 protected:
 
     IceUtilInternal::Atomic _ref;

data/ext/ice/cpp/{src → include}/IceUtil/StopWatch.h

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -25,7 +25,7 @@ public:
     {
         _s = IceUtil::Time::now(IceUtil::Time::Monotonic);
     }
-    
+
     IceUtil::Int64 stop()
     {
         assert(isStarted());

data/ext/ice/cpp/include/IceUtil/StringConverter.h

@@ -1,3 +1,6 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2017 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.
@@ -17,27 +20,16 @@
 namespace IceUtil
 {
 
-enum ConversionFlags
-{
-    strictConversion = 0,
-    lenientConversion
-};
-
-typedef unsigned char Byte;
-
-ICE_UTIL_API bool
-isLegalUTF8Sequence(const Byte* source, const Byte* end);
-
 //
-// Provides bytes to toUTF8. Can raise std::bad_alloc or Ice::MemoryLimitException 
+// Provides bytes to toUTF8. Can raise std::bad_alloc or Ice::MemoryLimitException
 // when too many bytes are requested.
 //
-class ICE_UTIL_API UTF8Buffer
+class ICE_API UTF8Buffer
 {
 public:
     virtual Byte* getMoreBytes(size_t howMany, Byte* firstUnused) = 0;
-    
-    virtual ~UTF8Buffer() {}
+
+    virtual ~UTF8Buffer();
 };
 
 //
@@ -46,8 +38,12 @@ public:
 // It report errors by raising IllegalConversionException or an exception raised
 // by UTF8Buffer
 //
+
 template<typename charT>
-class BasicStringConverter : public IceUtil::Shared
+class BasicStringConverter
+#ifndef ICE_CPP11_MAPPING
+    : public IceUtil::Shared
+#endif
 {
 public:
     //
@@ -62,104 +58,86 @@ public:
     //
     virtual void fromUTF8(const Byte* sourceStart, const Byte* sourceEnd,
                           std::basic_string<charT>& target) const = 0;
-};
 
-typedef BasicStringConverter<char> StringConverter;
-typedef IceUtil::Handle<StringConverter> StringConverterPtr;
-
-typedef BasicStringConverter<wchar_t> WstringConverter;
-typedef IceUtil::Handle<WstringConverter> WstringConverterPtr;
+    virtual ~BasicStringConverter()
+    {
+    }
+};
 
+#ifdef __clang__
 //
-// Converts to and from UTF-16 or UTF-32 depending on sizeof(wchar_t)
+// Explicit template instantiation so that dynamic_cast of derived exported
+// classes works well with clang, see ICE-7473.
 //
-class ICE_UTIL_API UnicodeWstringConverter : public WstringConverter
-{
-public:
-
-    UnicodeWstringConverter(ConversionFlags = lenientConversion);
-
-    virtual Byte* toUTF8(const wchar_t*, const wchar_t*, UTF8Buffer&) const;
-
-    virtual void fromUTF8(const Byte*, const Byte*, std::wstring&) const;
+template class ICE_API BasicStringConverter<char>;
+template class ICE_API BasicStringConverter<wchar_t>;
+#endif
 
-private:
-    const ConversionFlags _conversionFlags;
-};
+typedef BasicStringConverter<char> StringConverter;
+ICE_DEFINE_PTR(StringConverterPtr, StringConverter);
 
-#ifdef _WIN32
+typedef BasicStringConverter<wchar_t> WstringConverter;
+ICE_DEFINE_PTR(WstringConverterPtr, WstringConverter);
 
 //
-// Converts to/from UTF-8 using MultiByteToWideChar and WideCharToMultiByte
+// Create a WstringConverter that converts to and from UTF-16 or UTF-32
+// depending on sizeof(wchar_t).
 //
-class ICE_UTIL_API WindowsStringConverter : public StringConverter
-{
-public:
-
-    explicit WindowsStringConverter(unsigned int);
-
-    virtual Byte* toUTF8(const char*, const char*, UTF8Buffer&) const;
-
-    virtual void fromUTF8(const Byte*, const Byte*, std::string& target) const;
-
-private:
-    unsigned int _cp;
-    UnicodeWstringConverter _unicodeWstringConverter;
-};
-#endif
+//
+ICE_API WstringConverterPtr createUnicodeWstringConverter();
 
 //
 // Retrieve the per process narrow string converter.
 //
-ICE_UTIL_API StringConverterPtr getProcessStringConverter();
+ICE_API StringConverterPtr getProcessStringConverter();
 
 //
 // Set the per process narrow string converter.
 //
-ICE_UTIL_API void setProcessStringConverter(const StringConverterPtr&);
+ICE_API void setProcessStringConverter(const StringConverterPtr&);
 
 //
 // Retrieve the per process wide string converter.
 //
-ICE_UTIL_API WstringConverterPtr getProcessWstringConverter();
+ICE_API WstringConverterPtr getProcessWstringConverter();
 
 //
 // Set the per process wide string converter.
 //
-ICE_UTIL_API void setProcessWstringConverter(const WstringConverterPtr&);
-
+ICE_API void setProcessWstringConverter(const WstringConverterPtr&);
 
 //
 // Converts the given wide string to a narrow string
 //
-// If the StringConverter parameter is null, the result's narrow 
-// string encoding is UTF-8.  
-// If the WstringConverter parameter is null, the input's wstring 
+// If the StringConverter parameter is null, the result's narrow
+// string encoding is UTF-8.
+// If the WstringConverter parameter is null, the input's wstring
 // encoding is UTF-16 or UTF-32 depending on the size of wchar_t.
 //
-ICE_UTIL_API std::string
-wstringToString(const std::wstring&, const StringConverterPtr& = 0, 
-                const WstringConverterPtr& = 0, ConversionFlags = lenientConversion);
+ICE_API std::string
+wstringToString(const std::wstring&,
+                const StringConverterPtr& = 0,
+                const WstringConverterPtr& = 0);
 
 //
 // Converts the given narrow string to a wide string
 //
-// If the StringConverter parameter is null, the input's narrow string 
-// encoding is UTF-8.  
-// If the WstringConverter parameter is null, the result's wstring 
+// If the StringConverter parameter is null, the input's narrow string
+// encoding is UTF-8.
+// If the WstringConverter parameter is null, the result's wstring
 // encoding is UTF-16 or UTF-32 depending on the size of wchar_t.
 //
-ICE_UTIL_API std::wstring
-stringToWstring(const std::string&, const StringConverterPtr& = 0, 
-                const WstringConverterPtr& = 0, ConversionFlags = lenientConversion);
-
+ICE_API std::wstring
+stringToWstring(const std::string&,
+                const StringConverterPtr& = 0,
+                const WstringConverterPtr& = 0);
 
 //
 // Converts the given string from the native narrow string encoding to
 // UTF-8 using the given converter. If the converter is null, returns
 // the given string.
 //
-ICE_UTIL_API std::string
+ICE_API std::string
 nativeToUTF8(const std::string&, const StringConverterPtr&);
 
 //
@@ -167,9 +145,36 @@ nativeToUTF8(const std::string&, const StringConverterPtr&);
 // encoding using the given converter. If the converter is null,
 // returns the given string.
 //
-ICE_UTIL_API std::string
+ICE_API std::string
 UTF8ToNative(const std::string&, const StringConverterPtr&);
 
 }
 
+namespace IceUtilInternal
+{
+//
+// Convert from UTF-8 to UTF-16/32
+//
+ICE_API std::vector<unsigned short> toUTF16(const std::vector<IceUtil::Byte>&);
+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>&);
+
+}
+
+#ifdef _WIN32
+namespace IceUtil
+{
+//
+// 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
+
 #endif