zeroc-ice 3.6.2 → 3.6.3

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

@@ -18,7 +18,7 @@
 #include <langinfo.h>
 #include <string.h> // For strerror
 
-#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B) || defined(__FreeBSD__)
+#if (defined(__APPLE__) && _LIBICONV_VERSION < 0x010B)
     //
     // See http://sourceware.org/bugzilla/show_bug.cgi?id=2962
     //

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

@@ -28,7 +28,7 @@ public:
     // No copy constructor and assignment operator necessary. The
     // automatically generated copy constructor and assignment
     // operator do the right thing.
-    
+
     enum Clock { Realtime, Monotonic };
     static Time now(Clock = Realtime);
 
@@ -39,7 +39,7 @@ public:
     static Time secondsDouble(double);
     static Time milliSecondsDouble(double);
     static Time microSecondsDouble(double);
-    
+
 #ifndef _WIN32
     operator timeval() const;
 #endif
@@ -54,6 +54,7 @@ public:
 
     std::string toDateTime() const;
     std::string toDuration() const;
+    std::string toString(const std::string&) const;
 
     Time operator-() const
     {

data/ext/ice/cpp/include/Slice/PythonUtil.h

@@ -56,7 +56,7 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, const std::string&
 //
 SLICE_API void printHeader(IceUtilInternal::Output&);
 
-SLICE_API int compile(int, char*[]);
+SLICE_API int compile(const std::vector<std::string>&);
 
 }
 }

data/ext/ice/cpp/include/Slice/RubyUtil.h

@@ -46,7 +46,7 @@ SLICE_API std::string getAbsolute(const Slice::ContainedPtr&, IdentStyle, const
 //
 SLICE_API void printHeader(IceUtilInternal::Output&);
 
-SLICE_API int compile(int, char*[]);
+SLICE_API int compile(const std::vector<std::string>&);
 
 }
 }

data/ext/ice/cpp/include/Slice/Util.h

@@ -30,6 +30,11 @@ SLICE_API void emitWarning(const std::string&, const std::string&, const std::st
 SLICE_API void emitRaw(const char*);
 SLICE_API std::vector<std::string> filterMcppWarnings(const std::string&);
 SLICE_API void printGeneratedHeader(IceUtilInternal::Output& out, const std::string&, const std::string& commentStyle = "//");
+#ifdef _WIN32
+SLICE_API std::vector<std::string> argvToArgs(int argc, wchar_t* argv[]);
+#else
+SLICE_API std::vector<std::string> argvToArgs(int argc, char* argv[]);
+#endif
 
 class SLICE_API DependOutputUtil : IceUtil::noncopyable
 {

data/ext/ice/cpp/src/Ice/BuiltinSequences.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   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/src/Ice/Communicator.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -38,7 +38,7 @@
 #   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/src/Ice/CommunicatorF.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   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/src/Ice/Connection.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -35,7 +35,7 @@
 #   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/src/Ice/ConnectionF.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   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/src/Ice/ConnectionFactory.cpp

@@ -835,26 +835,10 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailed(c
                                                                                const LocalException& ex)
 {
     assert(_iter != _connectors.end());
-
-    if(_observer)
-    {
-        _observer->failed(ex.ice_name());
-        _observer->detach();
-    }
-
-    _factory->handleConnectionException(ex, _hasMore || _iter != _connectors.end() - 1);
-    if(dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex)) // No need to continue.
-    {
-        _factory->finishGetConnection(_connectors, ex, this);
-    }
-    else if(++_iter != _connectors.end()) // Try the next connector.
+    if(connectionStartFailedImpl(ex))
     {
         nextConnector();
     }
-    else
-    {
-        _factory->finishGetConnection(_connectors, ex, this);
-    }
 }
 
 //
@@ -979,40 +963,46 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::getConnection()
 void
 IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector()
 {
-    Ice::ConnectionIPtr connection;
-    try
+    while(true)
     {
-
-        const CommunicatorObserverPtr& obsv = _factory->_instance->initializationData().observer;
-        if(obsv)
+        try
         {
-            _observer = obsv->getConnectionEstablishmentObserver(_iter->endpoint, _iter->connector->toString());
-            if(_observer)
+            const CommunicatorObserverPtr& obsv = _factory->_instance->initializationData().observer;
+            if(obsv)
             {
-                _observer->attach();
+                _observer = obsv->getConnectionEstablishmentObserver(_iter->endpoint, _iter->connector->toString());
+                if(_observer)
+                {
+                    _observer->attach();
+                }
             }
-        }
 
-        assert(_iter != _connectors.end());
+            assert(_iter != _connectors.end());
 
-        if(_instance->traceLevels()->network >= 2)
-        {
-            Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
-            out << "trying to establish " << _iter->endpoint->protocol() << " connection to "
-                << _iter->connector->toString();
+            if(_instance->traceLevels()->network >= 2)
+            {
+                Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
+                out << "trying to establish " << _iter->endpoint->protocol() << " connection to "
+                    << _iter->connector->toString();
+            }
+            Ice::ConnectionIPtr connection = _factory->createConnection(_iter->connector->connect(), *_iter);
+            connection->start(this);
         }
-        connection = _factory->createConnection(_iter->connector->connect(), *_iter);
-        connection->start(this);
-    }
-    catch(const Ice::LocalException& ex)
-    {
-        if(_instance->traceLevels()->network >= 2)
+        catch(const Ice::LocalException& ex)
         {
-            Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
-            out << "failed to establish " << _iter->endpoint->protocol() << " connection to "
-                << _iter->connector->toString() << "\n" << ex;
+            if(_instance->traceLevels()->network >= 2)
+            {
+                Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
+                out << "failed to establish " << _iter->endpoint->protocol() << " connection to "
+                    << _iter->connector->toString() << "\n" << ex;
+            }
+
+            if(connectionStartFailedImpl(ex))
+            {
+                continue; // More connectors to try, continue.
+            }
         }
-        connectionStartFailed(connection, ex);
+        break;
     }
 }
 
@@ -1071,6 +1061,31 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::operator<(const Connect
     return this < &rhs;
 }
 
+bool
+IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailedImpl(const Ice::LocalException& ex)
+{
+    if(_observer)
+    {
+        _observer->failed(ex.ice_name());
+        _observer->detach();
+    }
+
+    _factory->handleConnectionException(ex, _hasMore || _iter != _connectors.end() - 1);
+    if(dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex)) // No need to continue.
+    {
+        _factory->finishGetConnection(_connectors, ex, this);
+    }
+    else if(++_iter != _connectors.end()) // Try the next connector.
+    {
+        return true;
+    }
+    else
+    {
+        _factory->finishGetConnection(_connectors, ex, this);
+    }
+    return false;
+}
+
 void
 IceInternal::IncomingConnectionFactory::activate()
 {

data/ext/ice/cpp/src/Ice/ConnectionFactory.h

@@ -116,6 +116,8 @@ private:
 
     private:
 
+        bool connectionStartFailedImpl(const Ice::LocalException&);
+
         const InstancePtr _instance;
         const OutgoingConnectionFactoryPtr _factory;
         const std::vector<EndpointIPtr> _endpoints;

data/ext/ice/cpp/src/Ice/Current.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   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/src/Ice/DynamicLibrary.cpp

@@ -15,6 +15,10 @@
 #   include <dlfcn.h>
 #endif
 
+#if defined(ICE_CPP11) && defined(__GNUC__) && (__GNUC__ < 6) && defined(__GLIBCXX__)
+#   define ICE_LIBSUFFIX "++11"
+#endif
+
 using namespace Ice;
 using namespace IceInternal;
 using namespace std;
@@ -89,8 +93,8 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
     if(comma == string::npos)
     {
         libName = libSpec;
-#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
-        libName += "++11";
+#  ifdef ICE_LIBSUFFIX
+        libName += ICE_LIBSUFFIX;
 #  endif
         if(useIceVersion)
         {
@@ -119,9 +123,9 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
             return 0;
         }
         libName = libSpec.substr(0, comma);
-#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
-        libName += "++11";
-#  endif
+#ifdef ICE_LIBSUFFIX
+        libName += ICE_LIBSUFFIX;
+#endif
         version = libSpec.substr(comma + 1);
     }
 

data/ext/ice/cpp/src/Ice/Endpoint.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   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/src/Ice/EndpointF.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -33,7 +33,7 @@
 #   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/src/Ice/EndpointTypes.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   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/src/Ice/FacetMap.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   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/src/Ice/Identity.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   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/src/Ice/ImplicitContext.cpp

@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 //
-// Ice version 3.6.2
+// Ice version 3.6.3
 //
 // <auto-generated>
 //
@@ -34,7 +34,7 @@
 #   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