zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/Ice/Comparable.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_COMPARABLE_H
 #define ICE_COMPARABLE_H

data/ext/ice/cpp/include/Ice/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_CONFIG_H
 #define ICE_CONFIG_H
@@ -31,6 +26,10 @@
 #   endif
 #endif
 
+#ifdef ICE_SWIFT
+#   include <dispatch/dispatch.h>
+#endif
+
 //
 // Define the Ice and IceInternal namespace, so that we can use the following
 // everywhere in our code:

data/ext/ice/cpp/include/Ice/ConnectionAsync.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_CONNECTION_ASYNC_H
 #define ICE_CONNECTION_ASYNC_H

data/ext/ice/cpp/include/Ice/ConnectionIF.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_CONNECTIONI_F_H
 #define ICE_CONNECTIONI_F_H

data/ext/ice/cpp/include/Ice/ConsoleUtil.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_CONSOLE_UTIL_H
 #define ICE_CONSOLE_UTIL_H

data/ext/ice/cpp/include/Ice/DefaultValueFactory.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_DEFAULT_VALUE_FACTORY_H
 #define ICE_DEFAULT_VALUE_FACTORY_H

data/ext/ice/cpp/include/Ice/DispatchInterceptor.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_DISPATCH_INTERCEPTOR_H
 #define ICE_DISPATCH_INTERCEPTOR_H

data/ext/ice/cpp/include/Ice/Dispatcher.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_DISPATCHER_H
 #define ICE_DISPATCHER_H

data/ext/ice/cpp/include/Ice/DynamicLibrary.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_DYNAMIC_LIBRARY_H
 #define ICE_DYNAMIC_LIBRARY_H

data/ext/ice/cpp/include/Ice/DynamicLibraryF.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_DYNAMIC_LIBRARY_F_H
 #define ICE_DYNAMIC_LIBRARY_F_H

data/ext/ice/cpp/include/Ice/Exception.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_EXCEPTION_H
 #define ICE_EXCEPTION_H
@@ -49,7 +44,7 @@ public:
 #endif
 
     /**
-     * Polymporphically clones this exception.
+     * Polymorphically clones this exception.
      * @return A shallow copy of this exception.
      */
 #ifdef ICE_CPP11_MAPPING
@@ -74,7 +69,7 @@ class ICE_API UserException : public IceUtil::Exception
 public:
 
     /**
-     * Polymporphically clones this exception.
+     * Polymorphically clones this exception.
      * @return A shallow copy of this exception.
      */
 #ifdef ICE_CPP11_MAPPING
@@ -131,7 +126,7 @@ public:
 #endif
 
     /**
-     * Polymporphically clones this exception.
+     * Polymorphically clones this exception.
      * @return A shallow copy of this exception.
      */
 #ifdef ICE_CPP11_MAPPING

data/ext/ice/cpp/include/Ice/ExceptionHelpers.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_EXCEPTION_HELPERS_H
 #define ICE_EXCEPTION_HELPERS_H
@@ -21,7 +16,7 @@ namespace Ice
 class LocalException;
 
 /**
- * Helper template for local exceptions.
+ * Helper template for the implementation of Ice::LocalException. It implements ice_id.
  * \headerfile Ice/Ice.h
  */
 template<typename T, typename B> class LocalExceptionHelper : public IceUtil::ExceptionHelper<T, B>
@@ -30,10 +25,6 @@ public:
 
     using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
 
-    /**
-     * Obtains the Slice type ID of this exception.
-     * @return The fully-scoped type ID.
-     */
     virtual std::string ice_id() const override
     {
         return T::ice_staticId();
@@ -41,7 +32,7 @@ public:
 };
 
 /**
- * Helper template for user exceptions.
+ * Helper template for the implementation of Ice::UserException. It implements ice_id.
  * \headerfile Ice/Ice.h
  */
 template<typename T, typename B> class UserExceptionHelper : public IceUtil::ExceptionHelper<T, B>
@@ -50,10 +41,6 @@ public:
 
     using IceUtil::ExceptionHelper<T, B>::ExceptionHelper;
 
-    /**
-     * Obtains the Slice type ID of this exception.
-     * @return The fully-scoped type ID.
-     */
     virtual std::string ice_id() const override
     {
         return T::ice_staticId();

data/ext/ice/cpp/include/Ice/FactoryTable.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_FACTORYTABLE_H
 #define ICE_FACTORYTABLE_H

data/ext/ice/cpp/include/Ice/FactoryTableInit.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_FACTORYTABLEINIT_H
 #define ICE_FACTORYTABLEINIT_H
@@ -26,7 +21,7 @@ public:
 
 static FactoryTableInit factoryTableInitializer;    // Dummy variable to force initialization of factoryTable
 
-extern ICE_API FactoryTable* factoryTable;
+extern ICE_API FactoryTable* factoryTable ICE_GLOBAL_VAR_SUFFIX;
 
 class ICE_API CompactIdInit
 {

data/ext/ice/cpp/include/Ice/Format.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_FORMAT_H
 #define ICE_FORMAT_H

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

@@ -1,16 +1,11 @@
-// **********************************************************************
 //
-// 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_FUNCTIONAL_H
 #define ICE_FUNCTIONAL_H
 
-#   if !defined(ICE_CPP11_MAPPING) || defined(ICE_BUILDING_SRC)
+#ifndef ICE_CPP11_MAPPING
 
 #include <IceUtil/Functional.h>
 #include <Ice/Handle.h>

data/ext/ice/cpp/include/Ice/GCObject.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_GC_OBJECT_H
 #define ICE_GC_OBJECT_H

data/ext/ice/cpp/include/Ice/Handle.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_HANDLE_H
 #define ICE_HANDLE_H

data/ext/ice/cpp/include/Ice/Ice.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_ICE_H
 #define ICE_ICE_H

data/ext/ice/cpp/include/Ice/IconvStringConverter.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_ICONV_STRING_CONVERTER
 #define ICE_ICONV_STRING_CONVERTER
@@ -18,13 +13,13 @@
 #ifndef _WIN32
 
 #include <Ice/StringConverter.h>
+#include <IceUtil/StringUtil.h>
 #include <IceUtil/ThreadException.h>
 #include <IceUtil/UndefSysMacros.h>
 
 #include <algorithm>
 #include <iconv.h>
 #include <langinfo.h>
-#include <string.h> // For strerror
 
 #if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
 //
@@ -70,7 +65,7 @@ public:
 
 #ifndef ICE_CPP11_MAPPING
     /**
-     * Polymporphically clones this exception.
+     * Polymorphically clones this exception.
      * @return A shallow copy of this exception.
      */
     virtual IconvInitializationException* ice_clone() const;
@@ -272,7 +267,7 @@ IconvStringConverter<charT>::toUTF8(const charT* sourceStart,
 #else
     char* inbuf = reinterpret_cast<char*>(const_cast<charT*>(sourceStart));
 #endif
-    size_t inbytesleft = (sourceEnd - sourceStart) * sizeof(charT);
+    size_t inbytesleft = static_cast<size_t>(sourceEnd - sourceStart) * sizeof(charT);
     char* outbuf  = 0;
 
     size_t count = 0;
@@ -289,9 +284,8 @@ IconvStringConverter<charT>::toUTF8(const charT* sourceStart,
 
     if(count == size_t(-1))
     {
-        throw Ice::IllegalConversionException(__FILE__,
-                                              __LINE__,
-                                              errno != 0 ? strerror(errno) : "Unknown error");
+        throw Ice::IllegalConversionException(__FILE__, __LINE__,
+                                              errno == 0 ? "Unknown error" : IceUtilInternal::errorToString(errno));
     }
     return reinterpret_cast<Ice::Byte*>(outbuf);
 }
@@ -317,7 +311,8 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B
 #else
     char* inbuf = reinterpret_cast<char*>(const_cast<Ice::Byte*>(sourceStart));
 #endif
-    size_t inbytesleft = sourceEnd - sourceStart;
+    assert(sourceEnd > sourceStart);
+    size_t inbytesleft = static_cast<size_t>(sourceEnd - sourceStart);
 
     char* outbuf = 0;
     size_t outbytesleft = 0;
@@ -331,7 +326,7 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B
         size_t bytesused = 0;
         if(outbuf != 0)
         {
-            bytesused = outbuf - reinterpret_cast<const char*>(target.data());
+            bytesused = static_cast<size_t>(outbuf - reinterpret_cast<const char*>(target.data()));
         }
 
         const size_t increment = std::max<size_t>(inbytesleft, 4);
@@ -345,9 +340,8 @@ IconvStringConverter<charT>::fromUTF8(const Ice::Byte* sourceStart, const Ice::B
 
     if(count == size_t(-1))
     {
-        throw Ice::IllegalConversionException(__FILE__,
-                                              __LINE__,
-                                              errno != 0 ? strerror(errno) : "Unknown error");
+        throw Ice::IllegalConversionException(__FILE__,  __LINE__,
+                                              errno == 0 ? "Unknown error" : IceUtilInternal::errorToString(errno));
     }
 
     target.resize(target.size() - (outbytesleft / sizeof(charT)));

data/ext/ice/cpp/include/Ice/Incoming.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_INCOMING_H
 #define ICE_INCOMING_H
@@ -83,7 +78,7 @@ public:
     void exception(const std::string&, bool);
 #if defined(_MSC_VER) && (_MSC_VER == 1500)
     //
-    // COMPILERFIX VC90 get confused with overloads above
+    // COMPILERFIX v90 get confused with overloads above
     // when passing a const char* as first argument.
     //
     void exception(const char* msg, bool amd)
@@ -107,7 +102,7 @@ protected:
 
 #if defined(_MSC_VER) && (_MSC_VER == 1500)
     //
-    // COMPILERFIX VC90 get confused with overloads above
+    // COMPILERFIX v90 get confused with overloads above
     // when passing a const char* as first argument.
     //
     void handleException(const char* msg, bool amd)
@@ -145,6 +140,12 @@ protected:
     DispatchInterceptorCallbacks _interceptorCBs;
 };
 
+// TODO: fix this warning
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(push)
+#   pragma warning(disable:4239)
+#endif
+
 class ICE_API Incoming : public IncomingBase
 {
 public:
@@ -215,6 +216,10 @@ private:
     IncomingAsyncPtr _inAsync;
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(pop)
+#endif
+
 }
 
 #endif