zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/Ice/IncomingAsync.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_ASYNC_H
 #define ICE_INCOMING_ASYNC_H
@@ -45,6 +40,12 @@ public:
 namespace IceInternal
 {
 
+// TODO: fix this warning
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(push)
+#   pragma warning(disable:4239)
+#endif
+
 //
 // We need virtual inheritance from AMDCallback, because we use multiple
 // inheritance from Ice::AMDCallback for generated AMD code.
@@ -118,6 +119,10 @@ private:
     const ResponseHandlerPtr _responseHandlerCopy;
 };
 
+#if defined(_MSC_VER) && (_MSC_VER >= 1900)
+#   pragma warning(pop)
+#endif
+
 }
 
 #ifndef ICE_CPP11_MAPPING

data/ext/ice/cpp/include/Ice/IncomingAsyncF.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_ASYNC_F_H
 #define ICE_INCOMING_ASYNC_F_H

data/ext/ice/cpp/include/Ice/Initialize.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_INITIALIZE_H
 #define ICE_INITIALIZE_H
@@ -298,6 +293,12 @@ struct InitializationData
     Instrumentation::CommunicatorObserverPtr observer;
 
 #ifdef ICE_CPP11_MAPPING
+
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wdocumentation" // param/return is not recognized for std::function data members
+#endif
+
     /**
      * Called whenever the communicator starts a new thread.
      */
@@ -343,6 +344,11 @@ struct InitializationData
      * @param size The number of bytes consumed by the requests currently in the queue.
      */
     std::function<void(const Ice::BatchRequest& req, int count, int size)> batchRequestInterceptor;
+
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#endif
+
 #else
     /**
      * The thread hook for the communicator.
@@ -676,7 +682,7 @@ public:
      * it will be destroyed.
      * @param holder The holder from which to adopt a communicator.
      */
-    CommunicatorHolder& operator=(CommunicatorHolder&& holder);
+    CommunicatorHolder& operator=(CommunicatorHolder&& holder) noexcept;
 
     /**
      * Determines whether the holder contains an instance.

data/ext/ice/cpp/include/Ice/InputStream.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_INPUT_STREAM_H
 #define ICE_INPUT_STREAM_H
@@ -62,7 +57,7 @@ public:
      * @param addr The target address.
      * @param v The unmarshaled value.
      */
-    typedef void (*PatchFunc)(void*, const ValuePtr&);
+    typedef void (*PatchFunc)(void* addr, const ValuePtr& v);
 
     /**
      * Constructs a stream using the latest encoding version but without a communicator.
@@ -387,7 +382,7 @@ public:
             _currentEncaps = new Encaps();
             _currentEncaps->previous = oldEncaps;
         }
-        _currentEncaps->start = i - b.begin();
+        _currentEncaps->start = static_cast<size_t>(i - b.begin());
 
         //
         // I don't use readSize() and writeSize() for encapsulations,
@@ -489,7 +484,7 @@ public:
         {
             // Skip the optional content of the encapsulation if we are expecting an
             // empty encapsulation.
-            i += sz - sizeof(Ice::Int) - 2;
+            i += static_cast<size_t>(sz) - sizeof(Ice::Int) - 2;
         }
         return encoding;
     }
@@ -516,7 +511,7 @@ public:
         }
 
         read(encoding);
-        i += sz - sizeof(Int) - 2;
+        i += static_cast<size_t>(sz) - sizeof(Int) - 2;
         return encoding;
     }
 
@@ -1179,7 +1174,7 @@ public:
      */
     size_type pos()
     {
-        return i - b.begin();
+        return static_cast<size_t>(i - b.begin());
     }
 
     /**

data/ext/ice/cpp/include/Ice/InstanceF.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_INSTANCE_F_H
 #define ICE_INSTANCE_F_H

data/ext/ice/cpp/include/Ice/InterfaceByValue.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_INTERFACE_BY_VALUE_H
 #define ICE_INTERFACE_BY_VALUE_H

data/ext/ice/cpp/include/Ice/LocalObject.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_LOCAL_OBJECT_H
 #define ICE_LOCAL_OBJECT_H

data/ext/ice/cpp/include/Ice/LocalObjectF.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_LOCAL_OBJECT_F_H
 #define ICE_LOCAL_OBJECT_F_H

data/ext/ice/cpp/include/Ice/LoggerUtil.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_LOGGER_UTIL_H
 #define ICE_LOGGER_UTIL_H

data/ext/ice/cpp/include/Ice/MetricsAdminI.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_METRICSADMIN_I_H
 #define ICE_METRICSADMIN_I_H
@@ -325,7 +320,14 @@ public:
         }
     }
 
-    MetricsMapT(const MetricsMapT& other) : MetricsMapI(other), _destroyed(false)
+    MetricsMapT(const MetricsMapT& other)
+        :
+#ifndef ICE_CPP11_MAPPING
+        IceUtil::Shared(),
+#endif
+        MetricsMapI(other),
+        IceUtil::Mutex(),
+        _destroyed(false)
     {
     }
 

data/ext/ice/cpp/include/Ice/MetricsFunctional.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_METRICSFUNCTIONAL_H
 #define ICE_METRICSFUNCTIONAL_H

data/ext/ice/cpp/include/Ice/MetricsObserverI.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 ICEMX_METRICSOBSERVER_I_H
 #define ICEMX_METRICSOBSERVER_I_H
@@ -132,6 +127,20 @@ protected:
                                                                                                 memberFn)));
         }
 
+#if ICE_CPLUSPLUS >= 201703L
+        //
+        // Since C++17 the noexcept-specification is part of the function type and we need a separate
+        // overload to handle memberFn being noexcept
+        //
+        template<typename I, typename O, typename Y> void
+        add(const std::string& name, O (Helper::*getFn)() const, Y (I::*memberFn)() const noexcept)
+        {
+            _attributes.insert(typename std::map<std::string,
+                               Resolver*>::value_type(name, new MemberFunctionResolver<I, O, Y>(name, getFn,
+                                                                                                memberFn)));
+        }
+#endif
+
     private:
 
         template<typename Y> class HelperMemberResolver : public Resolver
@@ -317,7 +326,7 @@ public:
 };
 ICE_DEFINE_PTR(UpdaterPtr, Updater);
 
-template<typename T> class UpdaterT : public Updater
+template<typename T> class UpdaterT ICE_FINAL : public Updater
 {
 public:
 

data/ext/ice/cpp/include/Ice/NativePropertiesAdmin.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_PROPERTIES_ADMIN_H
 #define ICE_PROPERTIES_ADMIN_H

data/ext/ice/cpp/include/Ice/Object.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_OBJECT_H
 #define ICE_OBJECT_H
@@ -334,7 +329,12 @@ public:
 protected:
 
     Object() {} // This class is abstract.
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wdeprecated-copy-dtor"
     virtual ~Object() {}
+#   pragma clang diagnostic pop
+#endif
 
 protected:
 

data/ext/ice/cpp/include/Ice/ObjectF.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_OBJECT_F_H
 #define ICE_OBJECT_F_H

data/ext/ice/cpp/include/Ice/ObserverHelper.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_OBSERVERHELPER_H
 #define ICE_OBSERVERHELPER_H

data/ext/ice/cpp/include/Ice/Optional.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.
-//
-// **********************************************************************
 
 //
 // Ice::optional is a placeholder for std::optional:
@@ -215,7 +210,7 @@ template <class T> inline constexpr typename std::remove_reference<T>::type&& co
 #if defined NDEBUG
 # define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) (EXPR)
 #else
-# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) ((CHECK) ? (EXPR) : ([]{assert(!#CHECK);}(), (EXPR)))
+# define TR2_OPTIONAL_ASSERTED_EXPRESSION(CHECK, EXPR) ((CHECK) ? (EXPR) : ([]{assert(false && #CHECK);}(), (EXPR)))
 #endif
 
 namespace detail_
@@ -545,15 +540,30 @@ public:
     return dataptr();
   }
 
+    //
+    // WORKAROUND error: implicit conversion turns string literal into bool
+    //
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wconversion"
+#endif
   constexpr T const& operator *() const {
     return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val());
   }
 
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#endif
+
   T& operator *() {
     assert (initialized());
     return contained_val();
   }
 
+#ifdef _MSC_VER
+#   pragma warning(push)
+#   pragma warning(disable:4702) // unreachable code
+#endif
   constexpr T const& value() const {
     return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
   }
@@ -562,6 +572,10 @@ public:
     return initialized() ? contained_val() : (throw bad_optional_access("bad optional access"), contained_val());
   }
 
+#ifdef _MSC_VER
+#   pragma warning(pop)
+#endif
+
 # endif
 
 # if OPTIONAL_HAS_THIS_RVALUE_REFS == 1

data/ext/ice/cpp/include/Ice/OutgoingAsync.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_OUTGOING_ASYNC_H
 #define ICE_OUTGOING_ASYNC_H
@@ -468,7 +463,12 @@ public:
                    std::function<void(bool)> sent) :
         OutgoingAsyncT<R>(proxy, false), LambdaInvoke(std::move(ex), std::move(sent))
     {
+#if ICE_CPLUSPLUS >= 201402L
+        // Move capture with C++14
+        _response = [this, response = std::move(response)](bool ok)
+#else
         _response = [this, response](bool ok)
+#endif
         {
             if(!ok)
             {
@@ -504,7 +504,12 @@ public:
                    std::function<void(bool)> sent) :
         OutgoingAsyncT<void>(proxy, false), LambdaInvoke(std::move(ex), std::move(sent))
     {
+#if ICE_CPLUSPLUS >= 201402L
+        // Move capture with C++14
+        _response = [this, response = std::move(response)](bool ok)
+#else
         _response = [this, response](bool ok)
+#endif
         {
             if(!ok)
             {
@@ -540,7 +545,12 @@ public:
                          std::function<void(bool)> sent) :
         OutgoingAsync(proxy, false), LambdaInvoke(std::move(ex), std::move(sent))
     {
+#if ICE_CPLUSPLUS >= 201402L
+        // Move capture with C++14
+        _response = [this, read = std::move(read)](bool ok)
+#else
         _response = [this, read](bool ok)
+#endif
         {
             if(!ok)
             {
@@ -585,7 +595,7 @@ public:
                 this->_is.startEncapsulation();
                 R v = this->_read(&this->_is);
                 this->_is.endEncapsulation();
-                this->_promise.set_value(v);
+                this->_promise.set_value(std::move(v));
             }
             else
             {
@@ -669,7 +679,7 @@ public:
 //
 // See comments in OutgoingAsync.cpp
 //
-extern ICE_API CallbackBasePtr dummyCallback;
+extern ICE_API CallbackBasePtr dummyCallback ICE_GLOBAL_VAR_SUFFIX;
 
 //
 // Generic callback template that requires the caller to down-cast the