zeroc-ice 3.7.2 → 3.7.3

data/ext/ice/cpp/include/Ice/InputStream.h

@@ -382,7 +382,7 @@ public:
             _currentEncaps = new Encaps();
             _currentEncaps->previous = oldEncaps;
         }
-        _currentEncaps->start = i - b.begin();
+        _currentEncaps->start = static_cast<size_t>(i - b.begin());
 
         //
         // I don't use readSize() and writeSize() for encapsulations,
@@ -484,7 +484,7 @@ public:
         {
             // Skip the optional content of the encapsulation if we are expecting an
             // empty encapsulation.
-            i += sz - sizeof(Ice::Int) - 2;
+            i += static_cast<size_t>(sz) - sizeof(Ice::Int) - 2;
         }
         return encoding;
     }
@@ -511,7 +511,7 @@ public:
         }
 
         read(encoding);
-        i += sz - sizeof(Int) - 2;
+        i += static_cast<size_t>(sz) - sizeof(Int) - 2;
         return encoding;
     }
 
@@ -1174,7 +1174,7 @@ public:
      */
     size_type pos()
     {
-        return i - b.begin();
+        return static_cast<size_t>(i - b.begin());
     }
 
     /**

data/ext/ice/cpp/include/Ice/Optional.h

@@ -540,10 +540,21 @@ public:
     return dataptr();
   }
 
+    //
+    // WORKAROUND error: implicit conversion turns string literal into bool
+    //
+#if defined(__clang__)
+#   pragma clang diagnostic push
+#   pragma clang diagnostic ignored "-Wconversion"
+#endif
   constexpr T const& operator *() const {
     return TR2_OPTIONAL_ASSERTED_EXPRESSION(initialized(), contained_val());
   }
 
+#if defined(__clang__)
+#   pragma clang diagnostic pop
+#endif
+
   T& operator *() {
     assert (initialized());
     return contained_val();

data/ext/ice/cpp/include/Ice/OutgoingAsync.h

@@ -664,7 +664,7 @@ public:
 //
 // See comments in OutgoingAsync.cpp
 //
-extern ICE_API CallbackBasePtr dummyCallback;
+extern ICE_API CallbackBasePtr dummyCallback ICE_GLOBAL_VAR_SUFFIX;
 
 //
 // Generic callback template that requires the caller to down-cast the

data/ext/ice/cpp/include/Ice/OutputStream.h

@@ -261,8 +261,8 @@ public:
         }
 
         Container::size_type position = b.size();
-        resize(position + sz);
-        memcpy(&b[position], &v[0], sz);
+        resize(position + static_cast<size_t>(sz));
+        memcpy(&b[position], &v[0], static_cast<size_t>(sz));
     }
 
     /**
@@ -680,8 +680,8 @@ public:
             if(sz > 0)
             {
                 Container::size_type position = b.size();
-                resize(position + sz);
-                memcpy(&b[position], v.data(), sz);
+                resize(position + static_cast<size_t>(sz));
+                memcpy(&b[position], v.data(), static_cast<size_t>(sz));
             }
         }
     }
@@ -706,7 +706,7 @@ public:
             if(sz > 0)
             {
                 Container::size_type position = b.size();
-                resize(position + sz);
+                resize(position + static_cast<size_t>(sz));
                 memcpy(&b[position], vdata, vsize);
             }
         }

data/ext/ice/cpp/include/Ice/Proxy.h

@@ -992,6 +992,12 @@ public:
      */
     ::std::shared_ptr<::Ice::ObjectPrx> ice_fixed(const ::std::shared_ptr<::Ice::Connection>& connection) const;
 
+    /**
+     * Determines whether this proxy is a fixed proxy.
+     * @return True if this proxy is a fixed proxy, false otherwise.
+     */
+    bool ice_isFixed() const;
+
     /**
      * Obtains the Connection for this proxy. If the proxy does not yet have an established connection,
      * it first attempts to create a connection.
@@ -1057,7 +1063,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this communicator. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this communicator.
      * @param ex The exception callback.
      * @param sent The sent callback.
      * @return A function that can be called to cancel the invocation locally.
@@ -1073,7 +1079,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this communicator. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this communicator.
      * @return The future object for the invocation.
      */
     template<template<typename> class P = std::promise> auto
@@ -2658,6 +2664,12 @@ public:
      */
     ::Ice::ObjectPrx ice_fixed(const ::Ice::ConnectionPtr& connection) const;
 
+    /**
+     * Determines whether this proxy is a fixed proxy.
+     * @return True if this proxy is a fixed proxy, false otherwise.
+     */
+    bool ice_isFixed() const;
+
     /**
      * Obtains the Connection for this proxy. If the proxy does not yet have an established connection,
      * it first attempts to create a connection.
@@ -2729,7 +2741,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this proxy. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this proxy.
      * @return The asynchronous result object for the invocation.
      */
     ::Ice::AsyncResultPtr begin_ice_flushBatchRequests()
@@ -2738,7 +2750,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this proxy. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this proxy.
      * @param cb Asynchronous callback object.
      * @param cookie User-defined data to associate with the invocation.
      * @return The asynchronous result object for the invocation.
@@ -2750,7 +2762,7 @@ public:
     }
 
     /**
-     * Flushes any pending batched requests for this proxy. The call blocks until the flush is complete.
+     * Flushes asynchronously any pending batched requests for this proxy.
      * @param cb Asynchronous callback object.
      * @param cookie User-defined data to associate with the invocation.
      * @return The asynchronous result object for the invocation.

data/ext/ice/cpp/include/Ice/StreamHelpers.h

@@ -583,7 +583,7 @@ struct StreamHelper<T, StreamHelperCategorySequence>
     read(S* stream, T& v)
     {
         Int sz = stream->readAndCheckSeqSize(StreamableTraits<typename T::value_type>::minWireSize);
-        T(sz).swap(v);
+        T(static_cast<size_t>(sz)).swap(v);
         for(typename T::iterator p = v.begin(); p != v.end(); ++p)
         {
             stream->read(*p);

data/ext/ice/cpp/include/Ice/Value.h

@@ -42,7 +42,7 @@ public:
     virtual void ice_preMarshal();
 
     /**
-     * The Ice run time invokes this method vafter unmarshaling an object's data members. This allows a
+     * The Ice run time invokes this method after unmarshaling an object's data members. This allows a
      * subclass to override this method in order to perform additional initialization.
      */
     virtual void ice_postUnmarshal();

data/ext/ice/cpp/include/IceUtil/Atomic.h

@@ -23,7 +23,7 @@
 #elif ((defined(__GNUC__) && (((__GNUC__* 100) + __GNUC_MINOR__) >= 401)) || __clang__)  &&                         \
         ((defined(__sun) && (defined(__sparc) || defined(__sparcv9))) || \
          defined(__APPLE__) || \
-        (defined(__linux) && \
+        (defined(__linux__) && \
                 (defined(__i486) || defined(__i586) || \
                  defined(__i686) || defined(__x86_64))))
 

data/ext/ice/cpp/include/IceUtil/Config.h

@@ -21,12 +21,14 @@
 #endif
 
 #if (defined(__BYTE_ORDER) && defined(__LITTLE_ENDIAN) && (__BYTE_ORDER == __LITTLE_ENDIAN)) || \
-    (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && (_BYTE_ORDER == _LITTLE_ENDIAN))
+    (defined(_BYTE_ORDER) && defined(_LITTLE_ENDIAN) && (_BYTE_ORDER == _LITTLE_ENDIAN)) || \
+    (defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__))
 
 #   define ICE_LITTLE_ENDIAN
 
 #elif (defined(__BYTE_ORDER) && defined(__BIG_ENDIAN) && (__BYTE_ORDER == __BIG_ENDIAN)) || \
-      (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && (_BYTE_ORDER == _BIG_ENDIAN))
+      (defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && (_BYTE_ORDER == _BIG_ENDIAN)) || \
+      (defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__))
 
 #   define ICE_BIG_ENDIAN
 
@@ -80,7 +82,7 @@
 #   elif defined(__WORDSIZE) && (__WORDSIZE == 32)
 #      define ICE_32
 #   elif defined(__sun) && (defined(__sparcv9) || defined(__x86_64))  || \
-         defined(__linux) && defined(__x86_64)                        || \
+         defined(__linux__) && defined(__x86_64)                      || \
          defined(__APPLE__) && defined(__x86_64)                      || \
          defined(__hppa) && defined(__LP64__)                         || \
          defined(_ARCH_COM) && defined(__64BIT__)                     || \
@@ -171,7 +173,7 @@
 //  With Visual Studio, we can import/export member functions without importing/
 //  exporting the whole class
 #   define ICE_MEMBER_IMPORT_EXPORT
-#elif defined(__GNUC__) || defined(__clang__)
+#elif (defined(__GNUC__) || defined(__clang__) || defined(__IBMCPP__)) && !defined(__ibmxl__)
 #   define ICE_DECLSPEC_EXPORT __attribute__((visibility ("default")))
 #   define ICE_DECLSPEC_IMPORT __attribute__((visibility ("default")))
 #elif defined(__SUNPRO_CC)
@@ -190,6 +192,14 @@
 #   define ICE_MEMBER(API) /**/
 #endif
 
+// With IBM xlC, the visibility attribute must be at the end of the
+// declaration of global variables.
+#if defined(__IBMCPP__) && !defined(ICE_STATIC_LIBS)
+#   define ICE_GLOBAL_VAR_SUFFIX __attribute__((visibility ("default")))
+#else
+#   define ICE_GLOBAL_VAR_SUFFIX /**/
+#endif
+
 //
 // Let's use these extensions with Ice:
 //
@@ -273,8 +283,8 @@
 //
 // The Ice version.
 //
-#define ICE_STRING_VERSION "3.7.2" // "A.B.C", with A=major, B=minor, C=patch
-#define ICE_INT_VERSION 30702      // AABBCC, with AA=major, BB=minor, CC=patch
+#define ICE_STRING_VERSION "3.7.3" // "A.B.C", with A=major, B=minor, C=patch
+#define ICE_INT_VERSION 30703      // AABBCC, with AA=major, BB=minor, CC=patch
 #define ICE_SO_VERSION "37"      // "ABC", with A=major, B=minor, C=patch
 
 #if !defined(ICE_BUILDING_ICE) && defined(ICE_API_EXPORTS)

data/ext/ice/cpp/include/IceUtil/ConsoleUtil.h

@@ -77,13 +77,13 @@ operator<<(ConsoleErr& err, const T& val)
 ICE_API ConsoleErr& endl(ConsoleErr&);
 ICE_API ConsoleErr& flush(ConsoleErr&);
 
-extern ICE_API ConsoleOut consoleOut;
-extern ICE_API ConsoleErr consoleErr;
+extern ICE_API ConsoleOut consoleOut ICE_GLOBAL_VAR_SUFFIX;
+extern ICE_API ConsoleErr consoleErr ICE_GLOBAL_VAR_SUFFIX;
 
 #else
 
-extern ICE_API std::ostream& consoleOut;
-extern ICE_API std::ostream& consoleErr;
+extern ICE_API std::ostream& consoleOut ICE_GLOBAL_VAR_SUFFIX;
+extern ICE_API std::ostream& consoleErr ICE_GLOBAL_VAR_SUFFIX;
 
 #endif
 

data/ext/ice/cpp/include/IceUtil/Optional.h

@@ -46,6 +46,14 @@ public:
     {
     }
 
+    /**
+     * Constructs an optional as a copy of the given optional.
+     * @param r The source optional.
+     */
+    Optional(const Optional& r) : _value(r._value), _isSet(r._isSet)
+    {
+    }
+
     /**
      * Constructs an optional with the given value.
      * @param p The initial value.

data/ext/ice/cpp/include/IceUtil/OutputUtil.h

@@ -72,12 +72,12 @@ protected:
 class ICE_API NextLine
 {
 };
-extern ICE_API NextLine nl;
+extern ICE_API NextLine nl ICE_GLOBAL_VAR_SUFFIX;
 
 class ICE_API Separator
 {
 };
-extern ICE_API Separator sp;
+extern ICE_API Separator sp ICE_GLOBAL_VAR_SUFFIX;
 
 // ----------------------------------------------------------------------
 // Output
@@ -87,9 +87,9 @@ class ICE_API Output : public OutputBase
 {
 public:
 
-    Output();
-    Output(std::ostream&);
-    Output(const char*);
+    Output(bool breakBeforeBlock = true, bool shortEmptyBlock = false);
+    Output(std::ostream&, bool = true, bool = false);
+    Output(const char*, bool = true, bool = false);
 
     virtual void print(const std::string&); // Print a string.
 
@@ -104,6 +104,9 @@ private:
     std::string _blockStart;
     std::string _blockEnd;
     int _par; // If >= 0, we are writing a parameter list.
+    const bool _breakBeforeBlock; // If true break before starting a new block.
+    const bool _shortEmptyBlock; // If true, an empty block is written <sb><eb>.
+    bool _emptyBlock;
 };
 
 template<typename T>
@@ -146,7 +149,7 @@ operator<<(Output& o, const Separator&)
 class ICE_API StartBlock
 {
 };
-extern ICE_API StartBlock sb;
+extern ICE_API StartBlock sb ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline Output&
@@ -159,7 +162,7 @@ operator<<(Output& o, const StartBlock&)
 class ICE_API EndBlock
 {
 };
-extern ICE_API EndBlock eb;
+extern ICE_API EndBlock eb ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline Output&
@@ -172,7 +175,7 @@ operator<<(Output& o, const EndBlock&)
 class ICE_API StartPar
 {
 };
-extern ICE_API StartPar spar;
+extern ICE_API StartPar spar ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline Output&
@@ -185,7 +188,7 @@ operator<<(Output& o, const StartPar&)
 class ICE_API EndPar
 {
 };
-extern ICE_API EndPar epar;
+extern ICE_API EndPar epar ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline Output&
@@ -198,7 +201,7 @@ operator<<(Output& o, const EndPar&)
 class ICE_API StartAbrk
 {
 };
-extern ICE_API StartAbrk sabrk;
+extern ICE_API StartAbrk sabrk ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline Output&
@@ -211,7 +214,7 @@ operator<<(Output& o, const StartAbrk&)
 class ICE_API EndAbrk
 {
 };
-extern ICE_API EndAbrk eabrk;
+extern ICE_API EndAbrk eabrk ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline Output&
@@ -289,7 +292,7 @@ operator<<(XMLOutput& o, const Separator&)
 class ICE_API EndElement
 {
 };
-extern ICE_API EndElement ee;
+extern ICE_API EndElement ee ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline XMLOutput&
@@ -350,12 +353,12 @@ operator<<(XMLOutput& o, const Attribute& e)
 class ICE_API StartEscapes
 {
 };
-extern ICE_API StartEscapes startEscapes;
+extern ICE_API StartEscapes startEscapes ICE_GLOBAL_VAR_SUFFIX;
 
 class ICE_API EndEscapes
 {
 };
-extern ICE_API EndEscapes endEscapes;
+extern ICE_API EndEscapes endEscapes ICE_GLOBAL_VAR_SUFFIX;
 
 template<>
 inline XMLOutput&

data/ext/ice/cpp/include/IceUtil/Random.h

@@ -37,7 +37,7 @@ struct RandomNumberGenerator : public std::unary_function<std::ptrdiff_t, std::p
 {
     std::ptrdiff_t operator()(std::ptrdiff_t d)
     {
-        return IceUtilInternal::random(static_cast<int>(d));
+        return static_cast<std::ptrdiff_t>(IceUtilInternal::random(static_cast<int>(d)));
     }
 };
 

data/ext/ice/cpp/include/IceUtil/ResourceConfig.h

@@ -7,8 +7,8 @@
 
 #include "winver.h"
 
-#define ICE_VERSION 3,7,2,0
-#define ICE_STRING_VERSION "3.7.2\0"
+#define ICE_VERSION 3,7,3,0
+#define ICE_STRING_VERSION "3.7.3\0"
 #define ICE_SO_VERSION "37\0"
 #define ICE_COMPANY_NAME "ZeroC, Inc.\0"
 #define ICE_COPYRIGHT "\251 ZeroC, Inc.\0"

data/ext/ice/cpp/include/IceUtil/ScannerConfig.h

@@ -30,4 +30,10 @@
 #   pragma warning(disable:5033)
 #endif
 
+#if defined(__clang__)
+#   pragma clang diagnostic ignored "-Wconversion"
+#   pragma clang diagnostic ignored "-Wsign-conversion"
+#   pragma clang diagnostic ignored "-Wdocumentation"
+#endif
+
 #endif

data/ext/ice/cpp/include/IceUtil/StringConverter.h

@@ -66,7 +66,7 @@ public:
     }
 };
 
-#ifdef __clang__
+#if defined(__clang__) && !defined(ICE_STATIC_LIBS)
 //
 // Explicit template instantiation so that dynamic_cast of derived exported
 // classes works well with clang, see ICE-7473.

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