zeroc-ice 3.7.2 → 3.7.3

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -53,10 +53,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -36,10 +36,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -156,18 +156,17 @@ struct ACM
     /**
      * The close semantics.
      */
-    ACMClose close;
+    ::Ice::ACMClose close;
     /**
      * The heartbeat semantics.
      */
-    ACMHeartbeat heartbeat;
+    ::Ice::ACMHeartbeat heartbeat;
 
     /**
-     * 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 int&, const ACMClose&, const ACMHeartbeat&> ice_tuple() const
+    std::tuple<const int&, const ::Ice::ACMClose&, const ::Ice::ACMHeartbeat&> ice_tuple() const
     {
         return std::tie(timeout, close, heartbeat);
     }
@@ -235,7 +234,7 @@ public:
      * @param adapterName The name of the adapter associated with the connection.
      * @param connectionId The connection id.
      */
-    ConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
+    ConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
         underlying(::std::move(underlying)),
         incoming(incoming),
         adapterName(::std::move(adapterName)),
@@ -247,7 +246,7 @@ public:
      * The information of the underyling transport or null if there's
      * no underlying transport.
      */
-    ::std::shared_ptr<ConnectionInfo> underlying;
+    ::std::shared_ptr<::Ice::ConnectionInfo> underlying;
     /**
      * Whether or not the connection is an incoming or outgoing
      * connection.
@@ -453,8 +452,7 @@ public:
 
     /**
      * Set the active connection management parameters.
-     * @param timeout The timeout value in seconds. It must be positive or 0, if a negative
-     * value is given, an invalid argument exception will be raised.
+     * @param timeout The timeout value in seconds, must be &gt;= 0.
      * @param close The close condition
      * @param heartbeat The hertbeat condition
      */
@@ -544,7 +542,7 @@ public:
      * @param remoteAddress The remote address.
      * @param remotePort The remote port.
      */
-    IPConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort) :
+    IPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort) :
         ConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId)),
         localAddress(::std::move(localAddress)),
         localPort(localPort),
@@ -605,7 +603,7 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    TCPConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, int rcvSize, int sndSize) :
+    TCPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, int rcvSize, int sndSize) :
         IPConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId), ::std::move(localAddress), localPort, ::std::move(remoteAddress), remotePort),
         rcvSize(rcvSize),
         sndSize(sndSize)
@@ -659,7 +657,7 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    UDPConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, const ::std::string& mcastAddress, int mcastPort, int rcvSize, int sndSize) :
+    UDPConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, int localPort, const ::std::string& remoteAddress, int remotePort, const ::std::string& mcastAddress, int mcastPort, int rcvSize, int sndSize) :
         IPConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId), ::std::move(localAddress), localPort, ::std::move(remoteAddress), remotePort),
         mcastAddress(::std::move(mcastAddress)),
         mcastPort(mcastPort),
@@ -711,7 +709,7 @@ public:
      * @param connectionId The connection id.
      * @param headers The headers from the HTTP upgrade request.
      */
-    WSConnectionInfo(const ::std::shared_ptr<ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const HeaderDict& headers) :
+    WSConnectionInfo(const ::std::shared_ptr<::Ice::ConnectionInfo>& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::Ice::HeaderDict& headers) :
         ConnectionInfo(::std::move(underlying), incoming, ::std::move(adapterName), ::std::move(connectionId)),
         headers(::std::move(headers))
     {
@@ -720,7 +718,7 @@ public:
     /**
      * The headers from the HTTP upgrade request.
      */
-    HeaderDict headers;
+    ::Ice::HeaderDict headers;
 };
 
 }
@@ -890,15 +888,15 @@ struct ACM
     /**
      * A timeout value in seconds.
      */
-    Int timeout;
+    ::Ice::Int timeout;
     /**
      * The close semantics.
      */
-    ACMClose close;
+    ::Ice::ACMClose close;
     /**
      * The heartbeat semantics.
      */
-    ACMHeartbeat heartbeat;
+    ::Ice::ACMHeartbeat heartbeat;
 
     bool operator==(const ACM& rhs_) const
     {
@@ -1047,7 +1045,7 @@ public:
      * @param adapterName The name of the adapter associated with the connection.
      * @param connectionId The connection id.
      */
-    ConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
+    ConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId) :
         underlying(underlying),
         incoming(incoming),
         adapterName(adapterName),
@@ -1059,7 +1057,7 @@ public:
      * The information of the underyling transport or null if there's
      * no underlying transport.
      */
-    ConnectionInfoPtr underlying;
+    ::Ice::ConnectionInfoPtr underlying;
     /**
      * Whether or not the connection is an incoming or outgoing
      * connection.
@@ -1325,8 +1323,7 @@ public:
 
     /**
      * Set the active connection management parameters.
-     * @param timeout The timeout value in seconds. It must be positive or 0, if a negative
-     * value is given, an invalid argument exception will be raised.
+     * @param timeout The timeout value in seconds, must be &gt;= 0.
      * @param close The close condition
      * @param heartbeat The hertbeat condition
      */
@@ -1426,7 +1423,7 @@ public:
      * @param remoteAddress The remote address.
      * @param remotePort The remote port.
      */
-    IPConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, Int localPort, const ::std::string& remoteAddress, Int remotePort) :
+    IPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort) :
         ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId),
         localAddress(localAddress),
         localPort(localPort),
@@ -1442,7 +1439,7 @@ public:
     /**
      * The local port.
      */
-    Int localPort;
+    ::Ice::Int localPort;
     /**
      * The remote address.
      */
@@ -1450,7 +1447,7 @@ public:
     /**
      * The remote port.
      */
-    Int remotePort;
+    ::Ice::Int remotePort;
 };
 
 /// \cond INTERNAL
@@ -1497,7 +1494,7 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    TCPConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, Int localPort, const ::std::string& remoteAddress, Int remotePort, Int rcvSize, Int sndSize) :
+    TCPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort, ::Ice::Int rcvSize, ::Ice::Int sndSize) :
         ::Ice::IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
         rcvSize(rcvSize),
         sndSize(sndSize)
@@ -1507,11 +1504,11 @@ public:
     /**
      * The connection buffer receive size.
      */
-    Int rcvSize;
+    ::Ice::Int rcvSize;
     /**
      * The connection buffer send size.
      */
-    Int sndSize;
+    ::Ice::Int sndSize;
 };
 
 /// \cond INTERNAL
@@ -1561,7 +1558,7 @@ public:
      * @param rcvSize The connection buffer receive size.
      * @param sndSize The connection buffer send size.
      */
-    UDPConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, Int localPort, const ::std::string& remoteAddress, Int remotePort, const ::std::string& mcastAddress, Int mcastPort, Int rcvSize, Int sndSize) :
+    UDPConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::std::string& localAddress, ::Ice::Int localPort, const ::std::string& remoteAddress, ::Ice::Int remotePort, const ::std::string& mcastAddress, ::Ice::Int mcastPort, ::Ice::Int rcvSize, ::Ice::Int sndSize) :
         ::Ice::IPConnectionInfo(underlying, incoming, adapterName, connectionId, localAddress, localPort, remoteAddress, remotePort),
         mcastAddress(mcastAddress),
         mcastPort(mcastPort),
@@ -1577,15 +1574,15 @@ public:
     /**
      * The multicast port.
      */
-    Int mcastPort;
+    ::Ice::Int mcastPort;
     /**
      * The connection buffer receive size.
      */
-    Int rcvSize;
+    ::Ice::Int rcvSize;
     /**
      * The connection buffer send size.
      */
-    Int sndSize;
+    ::Ice::Int sndSize;
 };
 
 /// \cond INTERNAL
@@ -1624,7 +1621,7 @@ public:
      * @param connectionId The connection id.
      * @param headers The headers from the HTTP upgrade request.
      */
-    WSConnectionInfo(const ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const HeaderDict& headers) :
+    WSConnectionInfo(const ::Ice::ConnectionInfoPtr& underlying, bool incoming, const ::std::string& adapterName, const ::std::string& connectionId, const ::Ice::HeaderDict& headers) :
         ::Ice::ConnectionInfo(underlying, incoming, adapterName, connectionId),
         headers(headers)
     {
@@ -1633,7 +1630,7 @@ public:
     /**
      * The headers from the HTTP upgrade request.
      */
-    HeaderDict headers;
+    ::Ice::HeaderDict headers;
 };
 
 /// \cond INTERNAL

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -32,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -36,10 +36,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -121,17 +121,17 @@ struct Current
     /**
      * The object adapter.
      */
-    ::std::shared_ptr<ObjectAdapter> adapter;
+    ::std::shared_ptr<::Ice::ObjectAdapter> adapter;
     /**
      * Information about the connection over which the current method
      * invocation was received. If the invocation is direct due to
      * collocation optimization, this value is set to null.
      */
-    ::std::shared_ptr<Connection> con;
+    ::std::shared_ptr<::Ice::Connection> con;
     /**
      * The Ice object identity.
      */
-    Identity id;
+    ::Ice::Identity id;
     /**
      * The facet.
      */
@@ -143,26 +143,25 @@ struct Current
     /**
      * The mode of the operation.
      */
-    OperationMode mode;
+    ::Ice::OperationMode mode;
     /**
      * The request context, as received from the client.
      */
-    Context ctx;
+    ::Ice::Context ctx;
     /**
-     * The request id unless oneway (0) or collocated (-1).
+     * The request id unless oneway (0).
      */
     int requestId;
     /**
      * The encoding version used to encode the input and output parameters.
      */
-    EncodingVersion encoding;
+    ::Ice::EncodingVersion encoding;
 
     /**
-     * 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 ::std::shared_ptr<ObjectAdapter>&, const ::std::shared_ptr<Connection>&, const Identity&, const ::std::string&, const ::std::string&, const OperationMode&, const Context&, const int&, const EncodingVersion&> ice_tuple() const
+    std::tuple<const ::std::shared_ptr<::Ice::ObjectAdapter>&, const ::std::shared_ptr<::Ice::Connection>&, const ::Ice::Identity&, const ::std::string&, const ::std::string&, const ::Ice::OperationMode&, const ::Ice::Context&, const int&, const ::Ice::EncodingVersion&> ice_tuple() const
     {
         return std::tie(adapter, con, id, facet, operation, mode, ctx, requestId, encoding);
     }
@@ -261,17 +260,17 @@ struct Current
     /**
      * The object adapter.
      */
-    ObjectAdapterPtr adapter;
+    ::Ice::ObjectAdapterPtr adapter;
     /**
      * Information about the connection over which the current method
      * invocation was received. If the invocation is direct due to
      * collocation optimization, this value is set to null.
      */
-    ConnectionPtr con;
+    ::Ice::ConnectionPtr con;
     /**
      * The Ice object identity.
      */
-    Identity id;
+    ::Ice::Identity id;
     /**
      * The facet.
      */
@@ -283,19 +282,19 @@ struct Current
     /**
      * The mode of the operation.
      */
-    OperationMode mode;
+    ::Ice::OperationMode mode;
     /**
      * The request context, as received from the client.
      */
-    Context ctx;
+    ::Ice::Context ctx;
     /**
-     * The request id unless oneway (0) or collocated (-1).
+     * The request id unless oneway (0).
      */
-    Int requestId;
+    ::Ice::Int requestId;
     /**
      * The encoding version used to encode the input and output parameters.
      */
-    EncodingVersion encoding;
+    ::Ice::EncodingVersion encoding;
 };
 
 }

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

@@ -2,7 +2,7 @@
 // Copyright (c) ZeroC, Inc. All rights reserved.
 //
 //
-// Ice version 3.7.2
+// Ice version 3.7.3
 //
 // <auto-generated>
 //
@@ -35,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 < 2
+#   if ICE_INT_VERSION % 100 < 3
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -144,7 +144,7 @@ public:
      * @param timeout The timeout for the endpoint in milliseconds.
      * @param compress Specifies whether or not compression should be used if available when using this endpoint.
      */
-    EndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress) :
+    EndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress) :
         underlying(::std::move(underlying)),
         timeout(timeout),
         compress(compress)
@@ -173,7 +173,7 @@ public:
      * The information of the underyling endpoint of null if there's
      * no underlying endpoint.
      */
-    ::std::shared_ptr<EndpointInfo> underlying;
+    ::std::shared_ptr<::Ice::EndpointInfo> underlying;
     /**
      * The timeout for the endpoint in milliseconds. 0 means
      * non-blocking, -1 means no timeout.
@@ -239,7 +239,7 @@ public:
      * @param port The port number.
      * @param sourceAddress The source IP address.
      */
-    IPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
+    IPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
         EndpointInfo(::std::move(underlying), timeout, compress),
         host(::std::move(host)),
         port(port),
@@ -288,7 +288,7 @@ public:
      * @param port The port number.
      * @param sourceAddress The source IP address.
      */
-    TCPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
+    TCPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress) :
         IPEndpointInfo(::std::move(underlying), timeout, compress, ::std::move(host), port, ::std::move(sourceAddress))
     {
     }
@@ -323,7 +323,7 @@ public:
      * @param mcastInterface The multicast interface.
      * @param mcastTtl The multicast time-to-live (or hops).
      */
-    UDPEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, int mcastTtl) :
+    UDPEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& host, int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, int mcastTtl) :
         IPEndpointInfo(::std::move(underlying), timeout, compress, ::std::move(host), port, ::std::move(sourceAddress)),
         mcastInterface(::std::move(mcastInterface)),
         mcastTtl(mcastTtl)
@@ -364,7 +364,7 @@ public:
      * @param compress Specifies whether or not compression should be used if available when using this endpoint.
      * @param resource The URI configured with the endpoint.
      */
-    WSEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& resource) :
+    WSEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::std::string& resource) :
         EndpointInfo(::std::move(underlying), timeout, compress),
         resource(::std::move(resource))
     {
@@ -402,7 +402,7 @@ public:
      * @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
      * @param rawBytes The raw encoding of the opaque endpoint.
      */
-    OpaqueEndpointInfo(const ::std::shared_ptr<EndpointInfo>& underlying, int timeout, bool compress, const EncodingVersion& rawEncoding, const ByteSeq& rawBytes) :
+    OpaqueEndpointInfo(const ::std::shared_ptr<::Ice::EndpointInfo>& underlying, int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) :
         EndpointInfo(::std::move(underlying), timeout, compress),
         rawEncoding(::std::move(rawEncoding)),
         rawBytes(::std::move(rawBytes))
@@ -413,11 +413,11 @@ public:
      * The encoding version of the opaque endpoint (to decode or
      * encode the rawBytes).
      */
-    EncodingVersion rawEncoding;
+    ::Ice::EncodingVersion rawEncoding;
     /**
      * The raw encoding of the opaque endpoint.
      */
-    ByteSeq rawBytes;
+    ::Ice::ByteSeq rawBytes;
 };
 
 }
@@ -574,7 +574,7 @@ public:
      * @param timeout The timeout for the endpoint in milliseconds.
      * @param compress Specifies whether or not compression should be used if available when using this endpoint.
      */
-    EndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress) :
+    EndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress) :
         underlying(underlying),
         timeout(timeout),
         compress(compress)
@@ -603,12 +603,12 @@ public:
      * The information of the underyling endpoint of null if there's
      * no underlying endpoint.
      */
-    EndpointInfoPtr underlying;
+    ::Ice::EndpointInfoPtr underlying;
     /**
      * The timeout for the endpoint in milliseconds. 0 means
      * non-blocking, -1 means no timeout.
      */
-    Int timeout;
+    ::Ice::Int timeout;
     /**
      * Specifies whether or not compression should be used if
      * available when using this endpoint.
@@ -691,7 +691,7 @@ public:
      * @param port The port number.
      * @param sourceAddress The source IP address.
      */
-    IPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress) :
+    IPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) :
         ::Ice::EndpointInfo(underlying, timeout, compress),
         host(host),
         port(port),
@@ -706,7 +706,7 @@ public:
     /**
      * The port number.
      */
-    Int port;
+    ::Ice::Int port;
     /**
      * The source IP address.
      */
@@ -751,7 +751,7 @@ public:
      * @param port The port number.
      * @param sourceAddress The source IP address.
      */
-    TCPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress) :
+    TCPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress) :
         ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress)
     {
     }
@@ -797,7 +797,7 @@ public:
      * @param mcastInterface The multicast interface.
      * @param mcastTtl The multicast time-to-live (or hops).
      */
-    UDPEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& host, Int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, Int mcastTtl) :
+    UDPEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& host, ::Ice::Int port, const ::std::string& sourceAddress, const ::std::string& mcastInterface, ::Ice::Int mcastTtl) :
         ::Ice::IPEndpointInfo(underlying, timeout, compress, host, port, sourceAddress),
         mcastInterface(mcastInterface),
         mcastTtl(mcastTtl)
@@ -811,7 +811,7 @@ public:
     /**
      * The multicast time-to-live (or hops).
      */
-    Int mcastTtl;
+    ::Ice::Int mcastTtl;
 };
 
 /// \cond INTERNAL
@@ -849,7 +849,7 @@ public:
      * @param compress Specifies whether or not compression should be used if available when using this endpoint.
      * @param resource The URI configured with the endpoint.
      */
-    WSEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const ::std::string& resource) :
+    WSEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::std::string& resource) :
         ::Ice::EndpointInfo(underlying, timeout, compress),
         resource(resource)
     {
@@ -898,7 +898,7 @@ public:
      * @param rawEncoding The encoding version of the opaque endpoint (to decode or encode the rawBytes).
      * @param rawBytes The raw encoding of the opaque endpoint.
      */
-    OpaqueEndpointInfo(const EndpointInfoPtr& underlying, Int timeout, bool compress, const EncodingVersion& rawEncoding, const ByteSeq& rawBytes) :
+    OpaqueEndpointInfo(const ::Ice::EndpointInfoPtr& underlying, ::Ice::Int timeout, bool compress, const ::Ice::EncodingVersion& rawEncoding, const ::Ice::ByteSeq& rawBytes) :
         ::Ice::EndpointInfo(underlying, timeout, compress),
         rawEncoding(rawEncoding),
         rawBytes(rawBytes)
@@ -909,11 +909,11 @@ public:
      * The encoding version of the opaque endpoint (to decode or
      * encode the rawBytes).
      */
-    EncodingVersion rawEncoding;
+    ::Ice::EncodingVersion rawEncoding;
     /**
      * The raw encoding of the opaque endpoint.
      */
-    ByteSeq rawBytes;
+    ::Ice::ByteSeq rawBytes;
 };
 
 /// \cond INTERNAL