zeroc-ice 3.7.1 → 3.7.6

data/ext/ice/cpp/include/generated/Ice/RouterF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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 version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -38,10 +33,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -93,8 +88,8 @@ namespace Ice
 
 class Router;
 /// \cond INTERNAL
-ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router>&);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
+ICE_API void _readProxy(::Ice::InputStream*, ::IceInternal::ProxyHandle< Router>&);
+ICE_API ::IceProxy::Ice::Object* upCast(Router*);
 /// \endcond
 
 }

data/ext/ice/cpp/include/generated/Ice/ServantLocator.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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 version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -39,10 +34,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -90,23 +85,23 @@ public:
      * the returned servant into its active servant map. This must be
      * done by the servant locator implementation, if this is desired.
      *
-     * <tt>locate</tt> can throw any user exception. If it does, that exception
+     * <code>locate</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If <tt>locate</tt> throws any exception, the Ice run time does <em>not</em>
-     * call <tt>finished</tt>.
+     * If <code>locate</code> throws any exception, the Ice run time does <em>not</em>
+     * call <code>finished</code>.
      *
-     * <p class="Note">If you call <tt>locate</tt> from your own code, you
-     * must also call <tt>finished</tt> when you have finished using the
-     * servant, provided that <tt>locate</tt> returned a non-null servant;
+     * <p class="Note">If you call <code>locate</code> from your own code, you
+     * must also call <code>finished</code> when you have finished using the
+     * servant, provided that <code>locate</code> returned a non-null servant;
      * otherwise, you will get undefined behavior if you use
      * servant locators such as the Freeze Evictor.
      * @param curr Information about the current operation for which
      * a servant is required.
-     * @param cookie A "cookie" that will be passed to <tt>finished</tt>.
+     * @param cookie A "cookie" that will be passed to <code>finished</code>.
      * @return The located servant, or null if no suitable servant has
      * been found.
      * @throws UserException The implementation can raise a UserException
@@ -119,22 +114,22 @@ public:
 
     /**
      * Called by the object adapter after a request has been
-     * made. This operation is only called if <tt>locate</tt> was called
+     * made. This operation is only called if <code>locate</code> was called
      * prior to the request and returned a non-null servant. This
      * operation can be used for cleanup purposes after a request.
      *
-     * <tt>finished</tt> can throw any user exception. If it does, that exception
+     * <code>finished</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If both the operation and <tt>finished</tt> throw an exception, the
-     * exception thrown by <tt>finished</tt> is marshaled back to the client.
+     * If both the operation and <code>finished</code> throw an exception, the
+     * exception thrown by <code>finished</code> is marshaled back to the client.
      * @param curr Information about the current operation call for
-     * which a servant was located by <tt>locate</tt>.
-     * @param servant The servant that was returned by <tt>locate</tt>.
-     * @param cookie The cookie that was returned by <tt>locate</tt>.
+     * which a servant was located by <code>locate</code>.
+     * @param servant The servant that was returned by <code>locate</code>.
+     * @param cookie The cookie that was returned by <code>locate</code>.
      * @throws UserException The implementation can raise a UserException
      * and the run time will marshal it as the result of the invocation.
      * @see ObjectAdapter
@@ -205,6 +200,12 @@ public:
 
     virtual ~ServantLocator();
 
+#ifdef ICE_CPP11_COMPILER
+    ServantLocator() = default;
+    ServantLocator(const ServantLocator&) = default;
+    ServantLocator& operator=(const ServantLocator&) = default;
+#endif
+
     /**
      * Called before a request is dispatched if a
      * servant cannot be found in the object adapter's active servant
@@ -212,23 +213,23 @@ public:
      * the returned servant into its active servant map. This must be
      * done by the servant locator implementation, if this is desired.
      *
-     * <tt>locate</tt> can throw any user exception. If it does, that exception
+     * <code>locate</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If <tt>locate</tt> throws any exception, the Ice run time does <em>not</em>
-     * call <tt>finished</tt>.
+     * If <code>locate</code> throws any exception, the Ice run time does <em>not</em>
+     * call <code>finished</code>.
      *
-     * <p class="Note">If you call <tt>locate</tt> from your own code, you
-     * must also call <tt>finished</tt> when you have finished using the
-     * servant, provided that <tt>locate</tt> returned a non-null servant;
+     * <p class="Note">If you call <code>locate</code> from your own code, you
+     * must also call <code>finished</code> when you have finished using the
+     * servant, provided that <code>locate</code> returned a non-null servant;
      * otherwise, you will get undefined behavior if you use
      * servant locators such as the Freeze Evictor.
      * @param curr Information about the current operation for which
      * a servant is required.
-     * @param cookie A "cookie" that will be passed to <tt>finished</tt>.
+     * @param cookie A "cookie" that will be passed to <code>finished</code>.
      * @return The located servant, or null if no suitable servant has
      * been found.
      * @throws UserException The implementation can raise a UserException
@@ -241,22 +242,22 @@ public:
 
     /**
      * Called by the object adapter after a request has been
-     * made. This operation is only called if <tt>locate</tt> was called
+     * made. This operation is only called if <code>locate</code> was called
      * prior to the request and returned a non-null servant. This
      * operation can be used for cleanup purposes after a request.
      *
-     * <tt>finished</tt> can throw any user exception. If it does, that exception
+     * <code>finished</code> can throw any user exception. If it does, that exception
      * is marshaled back to the client. If the Slice definition for the
      * corresponding operation includes that user exception, the client
      * receives that user exception; otherwise, the client receives
      * {@link UnknownUserException}.
      *
-     * If both the operation and <tt>finished</tt> throw an exception, the
-     * exception thrown by <tt>finished</tt> is marshaled back to the client.
+     * If both the operation and <code>finished</code> throw an exception, the
+     * exception thrown by <code>finished</code> is marshaled back to the client.
      * @param curr Information about the current operation call for
-     * which a servant was located by <tt>locate</tt>.
-     * @param servant The servant that was returned by <tt>locate</tt>.
-     * @param cookie The cookie that was returned by <tt>locate</tt>.
+     * which a servant was located by <code>locate</code>.
+     * @param servant The servant that was returned by <code>locate</code>.
+     * @param cookie The cookie that was returned by <code>locate</code>.
      * @throws UserException The implementation can raise a UserException
      * and the run time will marshal it as the result of the invocation.
      * @see ObjectAdapter

data/ext/ice/cpp/include/generated/Ice/ServantLocatorF.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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 version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/SliceChecksumDict.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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 version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/ValueFactory.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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 version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -71,10 +66,10 @@ namespace Ice
  * Create a new value for a given value type. The type is the
  * absolute Slice type id, i.e., the id relative to the
  * unnamed top-level Slice module. For example, the absolute
- * Slice type id for an interface <tt>Bar</tt> in the module
- * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+ * Slice type id for an interface <code>Bar</code> in the module
+ * <code>Foo</code> is <code>"::Foo::Bar"</code>.
  *
- * Note that the leading "<tt>::</tt>" is required.
+ * Note that the leading "<code>::</code>" is required.
  * @param type The value type.
  * @return The value created for the given type, or nil if the
  * factory is unable to create the value.
@@ -202,14 +197,20 @@ public:
 
     virtual ~ValueFactory();
 
+#ifdef ICE_CPP11_COMPILER
+    ValueFactory() = default;
+    ValueFactory(const ValueFactory&) = default;
+    ValueFactory& operator=(const ValueFactory&) = default;
+#endif
+
     /**
      * Create a new value for a given value type. The type is the
      * absolute Slice type id, i.e., the id relative to the
      * unnamed top-level Slice module. For example, the absolute
-     * Slice type id for an interface <tt>Bar</tt> in the module
-     * <tt>Foo</tt> is <tt>"::Foo::Bar"</tt>.
+     * Slice type id for an interface <code>Bar</code> in the module
+     * <code>Foo</code> is <code>"::Foo::Bar"</code>.
      *
-     * Note that the leading "<tt>::</tt>" is required.
+     * Note that the leading "<code>::</code>" is required.
      * @param type The value type.
      * @return The value created for the given type, or nil if the
      * factory is unable to create the value.
@@ -244,6 +245,12 @@ public:
 
     virtual ~ValueFactoryManager();
 
+#ifdef ICE_CPP11_COMPILER
+    ValueFactoryManager() = default;
+    ValueFactoryManager(const ValueFactoryManager&) = default;
+    ValueFactoryManager& operator=(const ValueFactoryManager&) = default;
+#endif
+
     /**
      * Add a value factory. Attempting to add a factory with an id for
      * which a factory is already registered throws AlreadyRegisteredException.

data/ext/ice/cpp/include/generated/Ice/Version.h

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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 version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -37,10 +32,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -66,15 +61,14 @@ namespace Ice
  */
 struct ProtocolVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     /**
-     * Obtains a tuple containing all of the exception's data members.
+     * Obtains a tuple containing all of the struct's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Byte&, const Byte&> ice_tuple() const
+    std::tuple<const ::Ice::Byte&, const ::Ice::Byte&> ice_tuple() const
     {
         return std::tie(major, minor);
     }
@@ -86,15 +80,14 @@ struct ProtocolVersion
  */
 struct EncodingVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     /**
-     * Obtains a tuple containing all of the exception's data members.
+     * Obtains a tuple containing all of the struct's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Byte&, const Byte&> ice_tuple() const
+    std::tuple<const ::Ice::Byte&, const ::Ice::Byte&> ice_tuple() const
     {
         return std::tie(major, minor);
     }
@@ -161,8 +154,8 @@ namespace Ice
  */
 struct ProtocolVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     bool operator==(const ProtocolVersion& rhs_) const
     {
@@ -230,8 +223,8 @@ struct ProtocolVersion
  */
 struct EncodingVersion
 {
-    Byte major;
-    Byte minor;
+    ::Ice::Byte major;
+    ::Ice::Byte minor;
 
     bool operator==(const EncodingVersion& rhs_) const
     {

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// 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 version 3.7.1
+// Ice version 3.7.6
 //
 // <auto-generated>
 //
@@ -40,10 +35,10 @@
 #   if ICE_INT_VERSION / 100 != 307
 #       error Ice version mismatch!
 #   endif
-#   if ICE_INT_VERSION % 100 > 50
+#   if ICE_INT_VERSION % 100 >= 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 6
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -98,9 +93,9 @@ public:
      * @param verified The certificate chain verification status.
      */
     ConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& cipher, const std::vector<CertificatePtr>& certs, bool verified) :
-        ::Ice::ConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId)),
-        cipher(::std::move(cipher)),
-        certs(::std::move(certs)),
+        ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId),
+        cipher(cipher),
+        certs(certs),
         verified(verified)
     {
     }
@@ -187,6 +182,11 @@ public:
     {
     }
 
+#ifdef ICE_CPP11_COMPILER
+    ConnectionInfo(const ConnectionInfo&) = default;
+    ConnectionInfo& operator=(const ConnectionInfo&) = default;
+#endif
+
     /**
      * The negotiated cipher suite.
      */