zeroc-ice 3.7.2 → 3.7.3

data/ext/ice/cpp/include/generated/Ice/EndpointF.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/EndpointTypes.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/FacetMap.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/Identity.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
@@ -75,10 +75,9 @@ struct Identity
     ::std::string category;
 
     /**
-     * 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::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(name, category);

data/ext/ice/cpp/include/generated/Ice/ImplicitContext.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

data/ext/ice/cpp/include/generated/Ice/ImplicitContextF.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/Instrumentation.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
@@ -334,14 +334,14 @@ public:
 /**
  * The observer updater interface. This interface is implemented by
  * the Ice run-time and an instance of this interface is provided by
- * the Ice communicator on initialization to the {@link
- * CommunicatorObserver} object set with the communicator
- * initialization data. The Ice communicator calls {@link
- * CommunicatorObserver#setObserverUpdater} to provide the observer
+ * the Ice communicator on initialization to the
+ * {@link CommunicatorObserver} object set with the communicator
+ * initialization data. The Ice communicator calls
+ * {@link CommunicatorObserver#setObserverUpdater} to provide the observer
  * updater.
  *
- * This interface can be used by add-ins implementing the {@link
- * CommunicatorObserver} interface to update the observers of
+ * This interface can be used by add-ins implementing the
+ * {@link CommunicatorObserver} interface to update the observers of
  * connections and threads.
  * \headerfile Ice/Ice.h
  */
@@ -959,14 +959,14 @@ inline bool operator<(const InvocationObserver& lhs, const InvocationObserver& r
 /**
  * The observer updater interface. This interface is implemented by
  * the Ice run-time and an instance of this interface is provided by
- * the Ice communicator on initialization to the {@link
- * CommunicatorObserver} object set with the communicator
- * initialization data. The Ice communicator calls {@link
- * CommunicatorObserver#setObserverUpdater} to provide the observer
+ * the Ice communicator on initialization to the
+ * {@link CommunicatorObserver} object set with the communicator
+ * initialization data. The Ice communicator calls
+ * {@link CommunicatorObserver#setObserverUpdater} to provide the observer
  * updater.
  *
- * This interface can be used by add-ins implementing the {@link
- * CommunicatorObserver} interface to update the observers of
+ * This interface can be used by add-ins implementing the
+ * {@link CommunicatorObserver} interface to update the observers of
  * connections and threads.
  * \headerfile Ice/Ice.h
  */

data/ext/ice/cpp/include/generated/Ice/InstrumentationF.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/LocalException.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
@@ -96,7 +96,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -157,7 +156,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -208,7 +206,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -271,7 +268,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(kindOfObject, id);
@@ -348,7 +344,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(kindOfObject, id);
@@ -419,7 +414,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(operation);
@@ -473,7 +467,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -532,7 +525,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(unknown);
@@ -599,7 +591,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(unknown);
@@ -664,7 +655,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(unknown);
@@ -708,7 +698,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -752,7 +741,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -810,7 +798,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(name);
@@ -873,7 +860,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(id);
@@ -933,7 +919,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(proxy);
@@ -995,7 +980,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(str);
@@ -1056,7 +1040,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(str);
@@ -1117,7 +1100,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(str);
@@ -1178,7 +1160,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(str);
@@ -1239,7 +1220,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(str);
@@ -1299,8 +1279,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Identity&> ice_tuple() const
+    std::tuple<const ::Ice::Identity&> ice_tuple() const
     {
         return std::tie(id);
     }
@@ -1319,7 +1298,7 @@ public:
     /**
      * The illegal identity.
      */
-    Identity id;
+    ::Ice::Identity id;
 };
 
 /**
@@ -1360,7 +1339,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -1427,8 +1405,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
+    std::tuple<const ::Ice::Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(id, facet, operation);
     }
@@ -1447,7 +1424,7 @@ public:
     /**
      * The identity of the Ice Object to which the request was sent.
      */
-    Identity id;
+    ::Ice::Identity id;
     /**
      * The facet to which the request was sent.
      */
@@ -1498,8 +1475,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
+    std::tuple<const ::Ice::Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(id, facet, operation);
     }
@@ -1556,8 +1532,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
+    std::tuple<const ::Ice::Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(id, facet, operation);
     }
@@ -1615,8 +1590,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
+    std::tuple<const ::Ice::Identity&, const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(id, facet, operation);
     }
@@ -1673,7 +1647,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&> ice_tuple() const
     {
         return std::tie(error);
@@ -1737,7 +1710,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&> ice_tuple() const
     {
         return std::tie(error);
@@ -1794,7 +1766,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&, const ::std::string&> ice_tuple() const
     {
         return std::tie(error, domain);
@@ -1856,7 +1827,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&, const ::std::string&> ice_tuple() const
     {
         return std::tie(error, path);
@@ -1916,7 +1886,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&> ice_tuple() const
     {
         return std::tie(error);
@@ -1972,7 +1941,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&> ice_tuple() const
     {
         return std::tie(error);
@@ -2027,7 +1995,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&> ice_tuple() const
     {
         return std::tie(error);
@@ -2085,7 +2052,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const int&, const ::std::string&> ice_tuple() const
     {
         return std::tie(error, host);
@@ -2140,7 +2106,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -2183,7 +2148,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -2226,7 +2190,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -2269,7 +2232,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -2313,7 +2275,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -2357,7 +2318,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -2401,7 +2361,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -2457,7 +2416,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -2520,8 +2478,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const ::std::string&, const ByteSeq&> ice_tuple() const
+    std::tuple<const ::std::string&, const ::Ice::ByteSeq&> ice_tuple() const
     {
         return std::tie(reason, badMagic);
     }
@@ -2540,7 +2497,7 @@ public:
     /**
      * A sequence containing the first four bytes of the incorrect message.
      */
-    ByteSeq badMagic;
+    ::Ice::ByteSeq badMagic;
 };
 
 /**
@@ -2584,8 +2541,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const ::std::string&, const ProtocolVersion&, const ProtocolVersion&> ice_tuple() const
+    std::tuple<const ::std::string&, const ::Ice::ProtocolVersion&, const ::Ice::ProtocolVersion&> ice_tuple() const
     {
         return std::tie(reason, bad, supported);
     }
@@ -2604,11 +2560,11 @@ public:
     /**
      * The version of the unsupported protocol.
      */
-    ProtocolVersion bad;
+    ::Ice::ProtocolVersion bad;
     /**
      * The version of the protocol that is supported.
      */
-    ProtocolVersion supported;
+    ::Ice::ProtocolVersion supported;
 };
 
 /**
@@ -2652,8 +2608,7 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
-    std::tuple<const ::std::string&, const EncodingVersion&, const EncodingVersion&> ice_tuple() const
+    std::tuple<const ::std::string&, const ::Ice::EncodingVersion&, const ::Ice::EncodingVersion&> ice_tuple() const
     {
         return std::tie(reason, bad, supported);
     }
@@ -2672,11 +2627,11 @@ public:
     /**
      * The version of the unsupported encoding.
      */
-    EncodingVersion bad;
+    ::Ice::EncodingVersion bad;
     /**
      * The version of the encoding that is supported.
      */
-    EncodingVersion supported;
+    ::Ice::EncodingVersion supported;
 };
 
 /**
@@ -2716,7 +2671,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -2772,7 +2726,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -2828,7 +2781,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -2883,7 +2835,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -2945,7 +2896,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3002,7 +2952,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const bool&> ice_tuple() const
     {
         return std::tie(graceful);
@@ -3063,7 +3012,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3118,7 +3066,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3176,7 +3123,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3231,7 +3177,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3286,7 +3231,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3341,7 +3285,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3403,7 +3346,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(reason, type);
@@ -3474,7 +3416,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&, const ::std::string&, const ::std::string&> ice_tuple() const
     {
         return std::tie(reason, type, expectedType);
@@ -3540,7 +3481,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3596,7 +3536,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3651,7 +3590,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3708,7 +3646,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(unsupportedFeature);
@@ -3769,7 +3706,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<const ::std::string&> ice_tuple() const
     {
         return std::tie(reason);
@@ -3818,7 +3754,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -3862,7 +3797,6 @@ public:
      * Obtains a tuple containing all of the exception's data members.
      * @return The data members in a tuple.
      */
-
     std::tuple<> ice_tuple() const
     {
         return std::tie();
@@ -4958,7 +4892,7 @@ public:
     /**
      * The illegal identity.
      */
-    Identity id;
+    ::Ice::Identity id;
 };
 
 /**
@@ -5064,7 +4998,7 @@ public:
     /**
      * The identity of the Ice Object to which the request was sent.
      */
-    Identity id;
+    ::Ice::Identity id;
     /**
      * The facet to which the request was sent.
      */
@@ -5274,7 +5208,7 @@ public:
      * <code>GetLastError()</code> or
      * <code>WSAGetLastError()</code>.
      */
-    Int error;
+    ::Ice::Int error;
 };
 
 /**
@@ -5612,7 +5546,7 @@ public:
      * Windows, this is the value returned by
      * <code>WSAGetLastError()</code>.
      */
-    Int error;
+    ::Ice::Int error;
     /**
      * The host name that could not be resolved.
      */
@@ -5981,7 +5915,7 @@ public:
     /**
      * A sequence containing the first four bytes of the incorrect message.
      */
-    ByteSeq badMagic;
+    ::Ice::ByteSeq badMagic;
 };
 
 /**
@@ -6033,11 +5967,11 @@ public:
     /**
      * The version of the unsupported protocol.
      */
-    ProtocolVersion bad;
+    ::Ice::ProtocolVersion bad;
     /**
      * The version of the protocol that is supported.
      */
-    ProtocolVersion supported;
+    ::Ice::ProtocolVersion supported;
 };
 
 /**
@@ -6089,11 +6023,11 @@ public:
     /**
      * The version of the unsupported encoding.
      */
-    EncodingVersion bad;
+    ::Ice::EncodingVersion bad;
     /**
      * The version of the encoding that is supported.
      */
-    EncodingVersion supported;
+    ::Ice::EncodingVersion supported;
 };
 
 /**