zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/Ice/SlicedData.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_SLICED_DATA_H
 #define ICE_SLICED_DATA_H

data/ext/ice/cpp/include/Ice/SlicedDataF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_SLICED_DATA_F_H
 #define ICE_SLICED_DATA_F_H

data/ext/ice/cpp/include/Ice/StreamHelpers.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_STREAM_HELPERS_H
 #define ICE_STREAM_HELPERS_H
@@ -588,7 +583,7 @@ struct StreamHelper<T, StreamHelperCategorySequence>
     read(S* stream, T& v)
     {
         Int sz = stream->readAndCheckSeqSize(StreamableTraits<typename T::value_type>::minWireSize);
-        T(sz).swap(v);
+        T(static_cast<size_t>(sz)).swap(v);
         for(typename T::iterator p = v.begin(); p != v.end(); ++p)
         {
             stream->read(*p);

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_STRING_CONVERTER_H
 #define ICE_STRING_CONVERTER_H

data/ext/ice/cpp/include/Ice/ThreadPoolF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_THREAD_POOL_F_H
 #define ICE_THREAD_POOL_F_H

data/ext/ice/cpp/include/Ice/UUID.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_UUID_H
 #define ICE_UUID_H

data/ext/ice/cpp/include/Ice/UniquePtr.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_UNIQUE_PTR_H
 #define ICE_UNIQUE_PTR_H

data/ext/ice/cpp/include/Ice/UniqueRef.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_UNIQUE_REF_H
 #define ICE_UNIQUE_REF_H

data/ext/ice/cpp/include/Ice/UserExceptionFactory.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_USER_EXCEPTION_FACTORY_H
 #define ICE_USER_EXCEPTION_FACTORY_H

data/ext/ice/cpp/include/Ice/Value.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_VALUE_H
 #define ICE_VALUE_H
@@ -47,7 +42,7 @@ public:
     virtual void ice_preMarshal();
 
     /**
-     * The Ice run time invokes this method vafter unmarshaling an object's data members. This allows a
+     * The Ice run time invokes this method after unmarshaling an object's data members. This allows a
      * subclass to override this method in order to perform additional initialization.
      */
     virtual void ice_postUnmarshal();

data/ext/ice/cpp/include/Ice/ValueF.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_VALUE_F_H
 #define ICE_VALUE_F_H

data/ext/ice/cpp/include/IceSSL/Config.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICESSL_CONFIG_H
 #define ICESSL_CONFIG_H

data/ext/ice/cpp/include/IceSSL/IceSSL.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICESSL_ICESSL_H
 #define ICESSL_ICESSL_H

data/ext/ice/cpp/include/IceSSL/OpenSSL.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICESSL_OPENSSL_H
 #define ICESSL_OPENSSL_H

data/ext/ice/cpp/include/IceSSL/Plugin.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICESSL_PLUGIN_H
 #define ICESSL_PLUGIN_H
@@ -36,6 +31,64 @@
 namespace IceSSL
 {
 
+/**
+ * The reason for an IceSSL certificate verification failure.
+ */
+#ifdef ICE_CPP11_MAPPING
+enum class TrustError : unsigned char
+#else
+enum TrustError
+#endif
+{
+    /** The certification verification succeed  */
+    NoError = 0,
+    /** The certificate chain length is greater than the specified maximum depth **/
+    ChainTooLong,
+    /** The X509 chain is invalid because a certificate has excluded a name constraint **/
+    HasExcludedNameConstraint,
+    /** The certificate has an undefined name constraint **/
+    HasNonDefinedNameConstraint,
+    /** The certificate has a non permitted name constraint **/
+    HasNonPermittedNameConstraint,
+    /** The certificate does not support a critical extension **/
+    HasNonSupportedCriticalExtension,
+    /** The certificate does not have a supported name constraint or has a name constraint that is unsupported **/
+    HasNonSupportedNameConstraint,
+    /** A host name mismatch has occurred **/
+    HostNameMismatch,
+    /** The X509 chain is invalid due to invalid basic constraints **/
+    InvalidBasicConstraints,
+    /** The X509 chain is invalid due to an invalid extension **/
+    InvalidExtension,
+    /** The X509 chain is invalid due to invalid name constraints **/
+    InvalidNameConstraints,
+    /** The X509 chain is invalid due to invalid policy constraints **/
+    InvalidPolicyConstraints,
+    /** The supplied certificate cannot be used for the specified purpose **/
+    InvalidPurpose,
+    /** The X509 chain is invalid due to an invalid certificate signature **/
+    InvalidSignature,
+    /** The X509 chain is not valid due to an invalid time value, such as a value that indicates an expired
+        certificate **/
+    InvalidTime,
+    /** The certificate is explicitly not trusted **/
+    NotTrusted,
+    /** The X509 chain could not be built up to the root certificate **/
+    PartialChain,
+    /** It is not possible to determine whether the certificate has been revoked **/
+    RevocationStatusUnknown,
+    /** The X509 chain is invalid due to a revoked certificate **/
+    Revoked,
+    /** The X509 chain is invalid due to an untrusted root certificate **/
+    UntrustedRoot,
+    /** The X509 chain is invalid due to other unknown failure **/
+    UnknownTrustFailure,
+};
+
+ICESSL_API TrustError getTrustError(const IceSSL::ConnectionInfoPtr&);
+ICESSL_API std::string getTrustErrorDescription(TrustError);
+ICESSL_API std::string getHost(const IceSSL::ConnectionInfoPtr&);
+
 /**
  * Thrown if the certificate cannot be read.
  * \headerfile IceSSL/IceSSL.h

data/ext/ice/cpp/include/IceSSL/SChannel.h

@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICESSL_SCHANNEL_H
 #define ICESSL_SCHANNEL_H
 
+#ifdef _WIN32
+
 #include <IceSSL/Plugin.h>
 
 #include <wincrypt.h>
@@ -71,3 +68,5 @@ public:
 } // IceSSL namespace end
 
 #endif
+
+#endif

data/ext/ice/cpp/include/IceSSL/SecureTransport.h

@@ -1,15 +1,12 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICESSL_SECURE_TRANSPORT_H
 #define ICESSL_SECURE_TRANSPORT_H
 
+#ifdef __APPLE__
+
 #include <IceSSL/Plugin.h>
 #include <Security/Security.h>
 
@@ -71,3 +68,5 @@ public:
 } // IceSSL namespace end
 
 #endif
+
+#endif

data/ext/ice/cpp/include/IceSSL/UWP.h

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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 ICESSL_UWP_H
 #define ICESSL_UWP_H

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_ATOMIC_H
 #define ICE_UTIL_ATOMIC_H
@@ -28,7 +23,7 @@
 #elif ((defined(__GNUC__) && (((__GNUC__* 100) + __GNUC_MINOR__) >= 401)) || __clang__)  &&                         \
         ((defined(__sun) && (defined(__sparc) || defined(__sparcv9))) || \
          defined(__APPLE__) || \
-        (defined(__linux) && \
+        (defined(__linux__) && \
                 (defined(__i486) || defined(__i586) || \
                  defined(__i686) || defined(__x86_64))))
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_COND_H
 #define ICE_UTIL_COND_H

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 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_CONFIG_H
 #define ICE_UTIL_CONFIG_H
@@ -26,12 +21,14 @@
 #endif
 
 #if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || \
-    (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && (_BYTE_ORDER == _LITTLE_ENDIAN))
+    (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && (_BYTE_ORDER == _LITTLE_ENDIAN)) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
 
 #   define ICE_LITTLE_ENDIAN
 
 #elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
-      (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && (_BYTE_ORDER == _BIG_ENDIAN))
+      (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && (_BYTE_ORDER == _BIG_ENDIAN)) || \
+      (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
 
 #   define ICE_BIG_ENDIAN
 
@@ -42,6 +39,7 @@
       defined(_M_IA64)     || \
       defined(__alpha__)   || \
       defined(__ARMEL__)   || \
+      defined(_M_ARM64)    || \
       defined(_M_ARM_FP)   || \
       defined(__arm64)     || \
       defined(__MIPSEL__)
@@ -85,7 +83,7 @@
 #   elif defined(__WORDSIZE) && (__WORDSIZE == 32)
 #      define ICE_32
 #   elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64))  || \
-         defined(__linux) && defined(__x86_64)                        || \
+         defined(__linux__) && defined(__x86_64)                      || \
          defined(__APPLE__) && defined(__x86_64)                      || \
          defined(__hppa) && defined(__LP64__)                         || \
          defined(_ARCH_COM) && defined(__64BIT__)                     || \
@@ -97,13 +95,19 @@
 #   endif
 #endif
 
+#if defined(_MSVC_LANG)
+#   define ICE_CPLUSPLUS _MSVC_LANG
+#else
+#   define ICE_CPLUSPLUS __cplusplus
+#endif
+
 //
 // Check for C++ 11 support
 //
 // For GCC, we recognize --std=c++0x only for GCC version 4.5 and greater,
 // as C++11 support in prior releases was too limited.
 //
-#if (__cplusplus >= 201103) || \
+#if (ICE_CPLUSPLUS >= 201103) || \
     ((defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__* 100) + __GNUC_MINOR__) >= 405)) || \
     (defined(_MSC_VER) && (_MSC_VER >= 1900))
 #   define ICE_CPP11_COMPILER
@@ -116,12 +120,14 @@
 #   error "you need a C++11 capable compiler to use the C++11 mapping"
 #endif
 
-#if defined(ICE_CPP11_COMPILER) && (!defined(_MSC_VER) || (_MSC_VER >= 1900))
+#if defined(ICE_CPP11_COMPILER)
 #   define ICE_NOEXCEPT noexcept
 #   define ICE_NOEXCEPT_FALSE noexcept(false)
+#   define ICE_FINAL final
 #else
 #   define ICE_NOEXCEPT throw()
 #   define ICE_NOEXCEPT_FALSE /**/
+#   define ICE_FINAL /**/
 #endif
 
 //
@@ -158,12 +164,6 @@
 #   define ICE_HAS_THREAD_SAFE_LOCAL_STATIC
 #endif
 
-#if defined(_MSVC_LANG)
-#   define ICE_CPLUSPLUS _MSVC_LANG
-#else
-#   define ICE_CPLUSPLUS __cplusplus
-#endif
-
 //
 // Compiler extensions to export and import symbols: see the documentation
 // for Visual Studio, Solaris Studio and GCC.
@@ -174,7 +174,7 @@
 //  With Visual Studio, we can import/export member functions without importing/
 //  exporting the whole class
 #   define ICE_MEMBER_IMPORT_EXPORT
-#elif defined(__GNUC__) || defined(__clang__)
+#elif (defined(__GNUC__) || defined(__clang__) || defined(__IBMCPP__)) && !defined(__ibmxl__)
 #   define ICE_DECLSPEC_EXPORT __attribute__((visibility ("default")))
 #   define ICE_DECLSPEC_IMPORT __attribute__((visibility ("default")))
 #elif defined(__SUNPRO_CC)
@@ -193,6 +193,14 @@
 #   define ICE_MEMBER(API) /**/
 #endif
 
+// With IBM xlC, the visibility attribute must be at the end of the
+// declaration of global variables.
+#if defined(__IBMCPP__) && !defined(ICE_STATIC_LIBS)
+#   define ICE_GLOBAL_VAR_SUFFIX __attribute__((visibility ("default")))
+#else
+#   define ICE_GLOBAL_VAR_SUFFIX /**/
+#endif
+
 //
 // Let's use these extensions with Ice:
 //
@@ -225,6 +233,12 @@
 #   define ICE_DEPRECATED_API(msg) /**/
 #endif
 
+#if defined(__clang__) || defined(__GNUC__)
+#   define ICE_MAYBE_UNUSED __attribute__((unused))
+#else
+#   define ICE_MAYBE_UNUSED /**/
+#endif
+
 #ifdef _WIN32
 #   include <windows.h>
 
@@ -270,8 +284,8 @@
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.7.1" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30701      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.7.6" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30706      // AABBCC, with AA=major, BB=minor, CC=patch
 #define ICE_SO_VERSION "37"      // "ABC", with A=major, B=minor, C=patch
 
 #if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)