zeroc-ice 3.7.1 → 3.7.2

data/ext/ice/cpp/include/IceUtil/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_UTIL_STRING_CONVERTER_H
 #define ICE_UTIL_STRING_CONVERTER_H

data/ext/ice/cpp/include/IceUtil/StringUtil.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_STRING_UTIL_H
 #define ICE_UTIL_STRING_UTIL_H

data/ext/ice/cpp/include/IceUtil/Thread.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_THREAD_H
 #define ICE_UTIL_THREAD_H

data/ext/ice/cpp/include/IceUtil/ThreadException.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_THREAD_EXCEPTION_H
 #define ICE_UTIL_THREAD_EXCEPTION_H

data/ext/ice/cpp/include/IceUtil/Time.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_TIME_H
 #define ICE_UTIL_TIME_H

data/ext/ice/cpp/include/IceUtil/Timer.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_TIMER_H
 #define ICE_UTIL_TIMER_H

data/ext/ice/cpp/include/IceUtil/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_UTIL_UUID_H
 #define ICE_UTIL_UUID_H

data/ext/ice/cpp/include/IceUtil/UndefSysMacros.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_UNDEF_SYS_MACROS_H
 #define ICE_UTIL_UNDEF_SYS_MACROS_H

data/ext/ice/cpp/include/generated/Ice/BuiltinSequences.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.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -125,32 +120,32 @@ typedef ::std::vector<bool> BoolSeq;
 /**
  * A sequence of bytes.
  */
-typedef ::std::vector<Ice::Byte> ByteSeq;
+typedef ::std::vector<Byte> ByteSeq;
 
 /**
  * A sequence of shorts.
  */
-typedef ::std::vector<Ice::Short> ShortSeq;
+typedef ::std::vector<Short> ShortSeq;
 
 /**
  * A sequence of ints.
  */
-typedef ::std::vector<Ice::Int> IntSeq;
+typedef ::std::vector<Int> IntSeq;
 
 /**
  * A sequence of longs.
  */
-typedef ::std::vector<Ice::Long> LongSeq;
+typedef ::std::vector<Long> LongSeq;
 
 /**
  * A sequence of floats.
  */
-typedef ::std::vector<Ice::Float> FloatSeq;
+typedef ::std::vector<Float> FloatSeq;
 
 /**
  * A sequence of doubles.
  */
-typedef ::std::vector<Ice::Double> DoubleSeq;
+typedef ::std::vector<Double> DoubleSeq;
 
 /**
  * A sequence of strings.
@@ -160,12 +155,12 @@ typedef ::std::vector< ::std::string> StringSeq;
 /**
  * A sequence of objects.
  */
-typedef ::std::vector<Ice::ObjectPtr> ObjectSeq;
+typedef ::std::vector<ObjectPtr> ObjectSeq;
 
 /**
  * A sequence of object proxies.
  */
-typedef ::std::vector<Ice::ObjectPrx> ObjectProxySeq;
+typedef ::std::vector<ObjectPrx> ObjectProxySeq;
 
 }
 

data/ext/ice/cpp/include/generated/Ice/Communicator.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.2
 //
 // <auto-generated>
 //
@@ -61,7 +56,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -190,8 +185,8 @@ public:
 
     /**
      * Convert a stringified proxy into a proxy. For example,
-     * <tt>MyCategory/MyObject:tcp -h some_host -p
-     * 10000</tt> creates a proxy that refers to the Ice object
+     * <code>MyCategory/MyObject:tcp -h some_host -p
+     * 10000</code> creates a proxy that refers to the Ice object
      * having an identity with a name "MyObject" and a category
      * "MyCategory", with the server running on host "some_host", port
      * 10000. If the stringified proxy does not parse correctly, the
@@ -199,7 +194,7 @@ public:
      * or IdentityParseException. Refer to the Ice manual for a detailed
      * description of the syntax supported by stringified proxies.
      * @param str The stringified proxy to convert into a proxy.
-     * @return The proxy, or nil if <tt>str</tt> is an empty string.
+     * @return The proxy, or nil if <code>str</code> is an empty string.
      * @see #proxyToString
      */
     virtual ::std::shared_ptr<::Ice::ObjectPrx> stringToProxy(const ::std::string& str) const = 0;
@@ -208,18 +203,18 @@ public:
      * Convert a proxy into a string.
      * @param obj The proxy to convert into a stringified proxy.
      * @return The stringified proxy, or an empty string if
-     * <tt>obj</tt> is nil.
+     * <code>obj</code> is nil.
      * @see #stringToProxy
      */
     virtual ::std::string proxyToString(const ::std::shared_ptr<ObjectPrx>& obj) const = 0;
 
     /**
      * Convert a set of proxy properties into a proxy. The "base"
-     * name supplied in the <tt>property</tt> argument refers to a
+     * name supplied in the <code>property</code> argument refers to a
      * property containing a stringified proxy, such as
-     * <tt>MyProxy=id:tcp -h localhost -p 10000</tt>. Additional
+     * <code>MyProxy=id:tcp -h localhost -p 10000</code>. Additional
      * properties configure local settings for the proxy, such as
-     * <tt>MyProxy.PreferSecure=1</tt>. The "Properties"
+     * <code>MyProxy.PreferSecure=1</code>. The "Properties"
      * appendix in the Ice manual describes each of the supported
      * proxy properties.
      * @param property The base property name.
@@ -256,7 +251,7 @@ public:
 
     /**
      * Create a new object adapter. The endpoints for the object
-     * adapter are taken from the property <tt><em>name</em>.Endpoints</tt>.
+     * adapter are taken from the property <code><em>name</em>.Endpoints</code>.
      *
      * It is legal to create an object adapter with the empty string as
      * its name. Such an object adapter is accessible via bidirectional
@@ -275,7 +270,7 @@ public:
 
     /**
      * Create a new object adapter with endpoints. This operation sets
-     * the property <tt><em>name</em>.Endpoints</tt>, and then calls
+     * the property <code><em>name</em>.Endpoints</code>, and then calls
      * {@link #createObjectAdapter}. It is provided as a convenience
      * function.
      *
@@ -410,7 +405,7 @@ public:
      * operation has no effect on existing proxies.
      *
      * You can also set a router for an individual proxy
-     * by calling the operation <tt>ice_router</tt> on the proxy.
+     * by calling the operation <code>ice_router</code> on the proxy.
      * @param rtr The default router to use for this communicator.
      * @see #getDefaultRouter
      * @see #createObjectAdapterWithRouter
@@ -434,7 +429,7 @@ public:
      * object adapters.
      *
      * You can also set a locator for an individual proxy by calling the
-     * operation <tt>ice_locator</tt> on the proxy, or for an object adapter
+     * operation <code>ice_locator</code> on the proxy, or for an object adapter
      * by calling {@link ObjectAdapter#setLocator} on the object adapter.
      * @param loc The default locator to use for this communicator.
      * @see #getDefaultLocator
@@ -746,8 +741,8 @@ public:
 
     /**
      * Convert a stringified proxy into a proxy. For example,
-     * <tt>MyCategory/MyObject:tcp -h some_host -p
-     * 10000</tt> creates a proxy that refers to the Ice object
+     * <code>MyCategory/MyObject:tcp -h some_host -p
+     * 10000</code> creates a proxy that refers to the Ice object
      * having an identity with a name "MyObject" and a category
      * "MyCategory", with the server running on host "some_host", port
      * 10000. If the stringified proxy does not parse correctly, the
@@ -755,7 +750,7 @@ public:
      * or IdentityParseException. Refer to the Ice manual for a detailed
      * description of the syntax supported by stringified proxies.
      * @param str The stringified proxy to convert into a proxy.
-     * @return The proxy, or nil if <tt>str</tt> is an empty string.
+     * @return The proxy, or nil if <code>str</code> is an empty string.
      * @see #proxyToString
      */
     virtual ObjectPrx stringToProxy(const ::std::string& str) const = 0;
@@ -764,18 +759,18 @@ public:
      * Convert a proxy into a string.
      * @param obj The proxy to convert into a stringified proxy.
      * @return The stringified proxy, or an empty string if
-     * <tt>obj</tt> is nil.
+     * <code>obj</code> is nil.
      * @see #stringToProxy
      */
     virtual ::std::string proxyToString(const ObjectPrx& obj) const = 0;
 
     /**
      * Convert a set of proxy properties into a proxy. The "base"
-     * name supplied in the <tt>property</tt> argument refers to a
+     * name supplied in the <code>property</code> argument refers to a
      * property containing a stringified proxy, such as
-     * <tt>MyProxy=id:tcp -h localhost -p 10000</tt>. Additional
+     * <code>MyProxy=id:tcp -h localhost -p 10000</code>. Additional
      * properties configure local settings for the proxy, such as
-     * <tt>MyProxy.PreferSecure=1</tt>. The "Properties"
+     * <code>MyProxy.PreferSecure=1</code>. The "Properties"
      * appendix in the Ice manual describes each of the supported
      * proxy properties.
      * @param property The base property name.
@@ -812,7 +807,7 @@ public:
 
     /**
      * Create a new object adapter. The endpoints for the object
-     * adapter are taken from the property <tt><em>name</em>.Endpoints</tt>.
+     * adapter are taken from the property <code><em>name</em>.Endpoints</code>.
      *
      * It is legal to create an object adapter with the empty string as
      * its name. Such an object adapter is accessible via bidirectional
@@ -831,7 +826,7 @@ public:
 
     /**
      * Create a new object adapter with endpoints. This operation sets
-     * the property <tt><em>name</em>.Endpoints</tt>, and then calls
+     * the property <code><em>name</em>.Endpoints</code>, and then calls
      * {@link #createObjectAdapter}. It is provided as a convenience
      * function.
      *
@@ -949,7 +944,7 @@ public:
      * Get the observer resolver object for this communicator.
      * @return This communicator's observer resolver object.
      */
-    virtual Instrumentation::CommunicatorObserverPtr getObserver() const ICE_NOEXCEPT = 0;
+    virtual ::Ice::Instrumentation::CommunicatorObserverPtr getObserver() const ICE_NOEXCEPT = 0;
 
     /**
      * Get the default router this communicator.
@@ -966,7 +961,7 @@ public:
      * operation has no effect on existing proxies.
      *
      * You can also set a router for an individual proxy
-     * by calling the operation <tt>ice_router</tt> on the proxy.
+     * by calling the operation <code>ice_router</code> on the proxy.
      * @param rtr The default router to use for this communicator.
      * @see #getDefaultRouter
      * @see #createObjectAdapterWithRouter
@@ -990,7 +985,7 @@ public:
      * object adapters.
      *
      * You can also set a locator for an individual proxy by calling the
-     * operation <tt>ice_locator</tt> on the proxy, or for an object adapter
+     * operation <code>ice_locator</code> on the proxy, or for an object adapter
      * by calling {@link ObjectAdapter#setLocator} on the object adapter.
      * @param loc The default locator to use for this communicator.
      * @see #getDefaultLocator

data/ext/ice/cpp/include/generated/Ice/CommunicatorF.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.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

data/ext/ice/cpp/include/generated/Ice/Connection.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.2
 //
 // <auto-generated>
 //
@@ -44,7 +39,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -217,7 +212,7 @@ namespace Ice
 {
 
 /**
- * Base class providing access to the connection details. *
+ * Base class providing access to the connection details.
  * \headerfile Ice/Ice.h
  */
 class ICE_CLASS(ICE_API) ConnectionInfo
@@ -1030,7 +1025,7 @@ namespace Ice
 {
 
 /**
- * Base class providing access to the connection details. *
+ * Base class providing access to the connection details.
  * \headerfile Ice/Ice.h
  */
 class ICE_API ConnectionInfo : public virtual LocalObject

data/ext/ice/cpp/include/generated/Ice/ConnectionF.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.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif