zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/Ice/OutgoingAsyncF.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_F_H
 #define ICE_OUTGOING_ASYNC_F_H

data/ext/ice/cpp/include/Ice/OutputStream.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_OUTPUT_STREAM_H
 #define ICE_OUTPUT_STREAM_H
@@ -266,8 +261,8 @@ public:
         }
 
         Container::size_type position = b.size();
-        resize(position + sz);
-        memcpy(&b[position], &v[0], sz);
+        resize(position + static_cast<size_t>(sz));
+        memcpy(&b[position], &v[0], static_cast<size_t>(sz));
     }
 
     /**
@@ -685,8 +680,8 @@ public:
             if(sz > 0)
             {
                 Container::size_type position = b.size();
-                resize(position + sz);
-                memcpy(&b[position], v.data(), sz);
+                resize(position + static_cast<size_t>(sz));
+                memcpy(&b[position], v.data(), static_cast<size_t>(sz));
             }
         }
     }
@@ -711,7 +706,7 @@ public:
             if(sz > 0)
             {
                 Container::size_type position = b.size();
-                resize(position + sz);
+                resize(position + static_cast<size_t>(sz));
                 memcpy(&b[position], vdata, vsize);
             }
         }

data/ext/ice/cpp/include/Ice/Protocol.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_PROTOCOL_H
 #define ICE_PROTOCOL_H

data/ext/ice/cpp/include/Ice/Proxy.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_PROXY_H
 #define ICE_PROXY_H
@@ -41,7 +36,7 @@ ICE_API extern const Context noExplicitContext;
 
 #if defined(_MSC_VER) && (_MSC_VER <= 1600)
 //
-// COMPILERFIX VC90 and VC100 get confused with namespaces and complains that
+// COMPILERFIX v90 and v100 get confused with namespaces and complains that
 // ::Ice::noExplicitContext isn't defined in IceProxy namespace.
 //
 namespace IceProxy
@@ -183,7 +178,12 @@ public:
     {
         if(response)
         {
+#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(this->_is.b.empty())
                 {
@@ -240,7 +240,11 @@ public:
                              ::std::function<void(bool)> sent) :
         ProxyGetConnection(proxy), LambdaInvoke(::std::move(ex), ::std::move(sent))
     {
+#if ICE_CPLUSPLUS >= 201402L
+        _response = [&, response = std::move(response)](bool)
+#else
         _response = [&, response](bool)
+#endif
         {
             response(getConnection());
         };
@@ -359,7 +363,8 @@ public:
                  ::std::function<void(bool)> sent = nullptr,
                  const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<bool>(response, ex, sent, this, &ObjectPrx::_iceI_isA, typeId, context);
+        return _makeLamdaOutgoing<bool>(std::move(response), std::move(ex), std::move(sent), this,
+                                        &ObjectPrx::_iceI_isA, typeId, context);
     }
 
     /**
@@ -404,7 +409,8 @@ public:
                   ::std::function<void(bool)> sent = nullptr,
                   const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<void>(response, ex, sent, this, &ObjectPrx::_iceI_ping, context);
+        return _makeLamdaOutgoing<void>(std::move(response), std::move(ex), std::move(sent), this,
+                                        &ObjectPrx::_iceI_ping, context);
     }
 
     /**
@@ -450,7 +456,8 @@ public:
                  ::std::function<void(bool)> sent = nullptr,
                  const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::vector<::std::string>>(response, ex, sent, this, &ObjectPrx::_iceI_ids, context);
+        return _makeLamdaOutgoing<::std::vector<::std::string>>(std::move(response), std::move(ex), std::move(sent),
+                                                                this, &ObjectPrx::_iceI_ids, context);
     }
 
     /**
@@ -495,7 +502,8 @@ public:
                 ::std::function<void(bool)> sent = nullptr,
                 const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
-        return _makeLamdaOutgoing<::std::string>(response, ex, sent, this, &ObjectPrx::_iceI_id, context);
+        return _makeLamdaOutgoing<::std::string>(std::move(response), std::move(ex), std::move(sent), this,
+                                                 &ObjectPrx::_iceI_id, context);
     }
 
     /**
@@ -588,12 +596,16 @@ public:
         ::std::function<void(::Ice::Object::Ice_invokeResult&&)> r;
         if(response)
         {
+#if ICE_CPLUSPLUS >= 201402L
+            r = [response = std::move(response)](::Ice::Object::Ice_invokeResult&& result)
+#else
             r = [response](::Ice::Object::Ice_invokeResult&& result)
+#endif
             {
                 response(result.returnValue, std::move(result.outParams));
             };
         }
-        auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), r, ex, sent);
+        auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), std::move(r), std::move(ex), std::move(sent));
         outAsync->invoke(operation, mode, ::IceInternal::makePair(inParams), context);
         return [outAsync]() { outAsync->cancel(); };
     }
@@ -674,12 +686,16 @@ public:
         ::std::function<void(Result&&)> r;
         if(response)
         {
+#if ICE_CPLUSPLUS >= 201402L
+            r = [response = std::move(response)](Result&& result)
+#else
             r = [response](Result&& result)
+#endif
             {
                 response(::std::get<0>(result), ::std::move(::std::get<1>(result)));
             };
         }
-        auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), r, ex, sent);
+        auto outAsync = ::std::make_shared<Outgoing>(shared_from_this(), std::move(r), std::move(ex), std::move(sent));
         outAsync->invoke(operation, mode, inParams, context);
         return [outAsync]() { outAsync->cancel(); };
     }
@@ -997,6 +1013,12 @@ public:
      */
     ::std::shared_ptr<::Ice::ObjectPrx> ice_fixed(const ::std::shared_ptr<::Ice::Connection>& connection) const;
 
+    /**
+     * Determines whether this proxy is a fixed proxy.
+     * @return True if this proxy is a fixed proxy, false otherwise.
+     */
+    bool ice_isFixed() const;
+
     /**
      * Obtains the Connection for this proxy. If the proxy does not yet have an established connection,
      * it first attempts to create a connection.
@@ -1022,7 +1044,7 @@ public:
                            ::std::function<void(bool)> sent = nullptr)
     {
         using LambdaOutgoing = ::IceInternal::ProxyGetConnectionLambda;
-        auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), response, ex, sent);
+        auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), std::move(response), std::move(ex), std::move(sent));
         _iceI_getConnection(outAsync);
         return [outAsync]() { outAsync->cancel(); };
     }
@@ -1062,7 +1084,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this communicator. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this communicator.
      * @param ex The exception callback.
      * @param sent The sent callback.
      * @return A function that can be called to cancel the invocation locally.
@@ -1072,13 +1094,13 @@ public:
                                 ::std::function<void(bool)> sent = nullptr)
     {
         using LambdaOutgoing = ::IceInternal::ProxyFlushBatchLambda;
-        auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), ex, sent);
+        auto outAsync = ::std::make_shared<LambdaOutgoing>(shared_from_this(), std::move(ex), std::move(sent));
         _iceI_flushBatchRequests(outAsync);
         return [outAsync]() { outAsync->cancel(); };
     }
 
     /**
-     * Flushes any pending batched requests for this communicator. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this communicator.
      * @return The future object for the invocation.
      */
     template<template<typename> class P = std::promise> auto
@@ -1127,7 +1149,8 @@ protected:
     template<typename R, typename Re, typename E, typename S, typename Obj, typename Fn, typename... Args>
     ::std::function<void()> _makeLamdaOutgoing(Re r, E e, S s, Obj obj, Fn fn, Args&&... args)
     {
-        auto outAsync = ::std::make_shared<::IceInternal::LambdaOutgoing<R>>(shared_from_this(), r, e, s);
+        auto outAsync = ::std::make_shared<::IceInternal::LambdaOutgoing<R>>(shared_from_this(),
+                                                                             std::move(r), std::move(e), std::move(s));
         (obj->*fn)(outAsync, std::forward<Args>(args)...);
         return [outAsync]() { outAsync->cancel(); };
     }
@@ -1620,8 +1643,6 @@ checkedCast(const ::std::shared_ptr<T>& b, const std::string& f, const ::Ice::Co
     return r;
 }
 
-ICE_API ::std::ostream& operator<<(::std::ostream&, const Ice::ObjectPrx&);
-
 }
 
 #else // C++98 mapping
@@ -2665,6 +2686,12 @@ public:
      */
     ::Ice::ObjectPrx ice_fixed(const ::Ice::ConnectionPtr& connection) const;
 
+    /**
+     * Determines whether this proxy is a fixed proxy.
+     * @return True if this proxy is a fixed proxy, false otherwise.
+     */
+    bool ice_isFixed() const;
+
     /**
      * Obtains the Connection for this proxy. If the proxy does not yet have an established connection,
      * it first attempts to create a connection.
@@ -2736,7 +2763,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this proxy. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this proxy.
      * @return The asynchronous result object for the invocation.
      */
     ::Ice::AsyncResultPtr begin_ice_flushBatchRequests()
@@ -2745,7 +2772,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this proxy. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this proxy.
      * @param cb Asynchronous callback object.
      * @param cookie User-defined data to associate with the invocation.
      * @return The asynchronous result object for the invocation.
@@ -2757,7 +2784,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this proxy. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this proxy.
      * @param cb Asynchronous callback object.
      * @param cookie User-defined data to associate with the invocation.
      * @return The asynchronous result object for the invocation.

data/ext/ice/cpp/include/Ice/ProxyF.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_PROXY_F_H
 #define ICE_PROXY_F_H

data/ext/ice/cpp/include/Ice/ProxyFactoryF.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_PROXY_FACTORY_F_H
 #define ICE_PROXY_FACTORY_F_H

data/ext/ice/cpp/include/Ice/ProxyHandle.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_PROXY_HANDLE_H
 #define ICE_PROXY_HANDLE_H

data/ext/ice/cpp/include/Ice/ReferenceF.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_REFERENCE_F_H
 #define ICE_REFERENCE_F_H

data/ext/ice/cpp/include/Ice/RegisterPlugins.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_REGISTER_PLUGINS_H
 #define ICE_REGISTER_PLUGINS_H

data/ext/ice/cpp/include/Ice/RequestHandlerF.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_REQUEST_HANDLER_F_H
 #define ICE_REQUEST_HANDLER_F_H

data/ext/ice/cpp/include/Ice/ResponseHandlerF.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_RESPONSE_HANDLER_F_H
 #define ICE_RESPONSE_HANDLER_F_H

data/ext/ice/cpp/include/Ice/SHA1.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_SHA1_H
 #define ICE_SHA1_H

data/ext/ice/cpp/include/Ice/ServantManagerF.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_SERVANT_MANAGER_F_H
 #define ICE_SERVANT_MANAGER_F_H

data/ext/ice/cpp/include/Ice/Service.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_SERVICE_H
 #define ICE_SERVICE_H
@@ -162,6 +157,7 @@ public:
      */
     bool checkSystem() const;
 
+#ifdef _WIN32
     /**
      * Alternative entry point for services that use their own
      * command-line options. Instead of invoking main(), the
@@ -177,7 +173,6 @@ public:
      * specified, the version of the Ice installation is used.
      * @return The application's exit status: EXIT_FAILURE or EXIT_SUCCESS.
      */
-#ifdef _WIN32
     int run(int argc, const wchar_t* const argv[], const InitializationData& initData = InitializationData(),
             int version = ICE_INT_VERSION);
 #endif

data/ext/ice/cpp/include/Ice/SliceChecksums.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_SLICE_CHECKSUM_H
 #define ICE_SLICE_CHECKSUM_H