zeroc-ice 3.7.0 → 3.7.5

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -39,10 +34,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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
 
 #include <IceUtil/DisableWarnings.h>
 #include <Ice/LocatorInfo.h>
@@ -48,7 +43,7 @@ public:
 #ifdef ICE_CPP11_MAPPING
             LocatorInfo::RequestPtr request = this;
             _locatorInfo->getLocator()->findObjectByIdAsync(
-                _ref->getIdentity(),
+                _reference->getIdentity(),
                 [request](const ObjectPrxPtr& object)
                 {
                     request->response(object);
@@ -66,7 +61,7 @@ public:
                 });
 #else
             _locatorInfo->getLocator()->begin_findObjectById(
-                _ref->getIdentity(),
+                _reference->getIdentity(),
                 newCallback_Locator_findObjectById(static_cast<LocatorInfo::Request*>(this),
                                                    &LocatorInfo::Request::response,
                                                    &LocatorInfo::Request::exception));
@@ -94,7 +89,7 @@ public:
         {
 #ifdef ICE_CPP11_MAPPING
             LocatorInfo::RequestPtr request = this;
-            _locatorInfo->getLocator()->findAdapterByIdAsync(_ref->getAdapterId(),
+            _locatorInfo->getLocator()->findAdapterByIdAsync(_reference->getAdapterId(),
                 [request](const shared_ptr<Ice::ObjectPrx>& object)
                 {
                     request->response(object);
@@ -112,7 +107,7 @@ public:
                 });
 #else
             _locatorInfo->getLocator()->begin_findAdapterById(
-                _ref->getAdapterId(),
+                _reference->getAdapterId(),
                 newCallback_Locator_findAdapterById(static_cast<LocatorInfo::Request*>(this),
                                                     &LocatorInfo::Request::response,
                                                     &LocatorInfo::Request::exception));
@@ -352,7 +347,7 @@ IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locato
     if(proxy)
     {
         ReferencePtr r = proxy->_getReference();
-        if(_ref->isWellKnown() && !isSupported(_ref->getEncoding(), r->getEncoding()))
+        if(_reference->isWellKnown() && !isSupported(_reference->getEncoding(), r->getEncoding()))
         {
             //
             // If a well-known proxy and the returned proxy encoding
@@ -364,26 +359,26 @@ IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locato
         {
             endpoints = r->getEndpoints();
         }
-        else if(_ref->isWellKnown() && !r->isWellKnown())
+        else if(_reference->isWellKnown() && !r->isWellKnown())
         {
             //
             // We're resolving the endpoints of a well-known object and the proxy returned
             // by the locator is an indirect proxy. We now need to resolve the endpoints
             // of this indirect proxy.
             //
-            if(_ref->getInstance()->traceLevels()->location >= 1)
+            if(_reference->getInstance()->traceLevels()->location >= 1)
             {
                 locatorInfo->trace("retrieved adapter for well-known object from locator, adding to locator cache",
-                                   _ref, r);
+                                   _reference, r);
             }
-            locatorInfo->getEndpoints(r, _ref, _ttl, _callback);
+            locatorInfo->getEndpoints(r, _reference, _ttl, _callback);
             return;
         }
     }
 
-    if(_ref->getInstance()->traceLevels()->location >= 1)
+    if(_reference->getInstance()->traceLevels()->location >= 1)
     {
-        locatorInfo->getEndpointsTrace(_ref, endpoints, false);
+        locatorInfo->getEndpointsTrace(_reference, endpoints, false);
     }
     if(_callback)
     {
@@ -396,7 +391,7 @@ IceInternal::LocatorInfo::RequestCallback::exception(const LocatorInfoPtr& locat
 {
     try
     {
-        locatorInfo->getEndpointsException(_ref, exc); // This throws.
+        locatorInfo->getEndpointsException(_reference, exc); // This throws.
     }
     catch(const Ice::LocalException& ex)
     {
@@ -410,7 +405,7 @@ IceInternal::LocatorInfo::RequestCallback::exception(const LocatorInfoPtr& locat
 IceInternal::LocatorInfo::RequestCallback::RequestCallback(const ReferencePtr& ref,
                                                            int ttl,
                                                            const GetEndpointsCallbackPtr& cb) :
-    _ref(ref),  _ttl(ttl), _callback(cb)
+    _reference(ref),  _ttl(ttl), _callback(cb)
 {
 }
 
@@ -452,7 +447,7 @@ IceInternal::LocatorInfo::Request::addCallback(const ReferencePtr& ref,
 }
 
 IceInternal::LocatorInfo::Request::Request(const LocatorInfoPtr& locatorInfo, const ReferencePtr& ref) :
-    _locatorInfo(locatorInfo), _ref(ref), _sent(false), _response(false)
+    _locatorInfo(locatorInfo), _reference(ref), _sent(false), _response(false)
 {
 }
 
@@ -461,7 +456,7 @@ IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrxPtr& proxy)
 {
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-        _locatorInfo->finishRequest(_ref, _wellKnownRefs, proxy, false);
+        _locatorInfo->finishRequest(_reference, _wellKnownRefs, proxy, false);
         _response = true;
         _proxy = proxy;
         _monitor.notifyAll();
@@ -477,7 +472,7 @@ IceInternal::LocatorInfo::Request::exception(const Ice::Exception& ex)
 {
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
-        _locatorInfo->finishRequest(_ref, _wellKnownRefs, 0, dynamic_cast<const Ice::UserException*>(&ex));
+        _locatorInfo->finishRequest(_reference, _wellKnownRefs, 0, dynamic_cast<const Ice::UserException*>(&ex));
 
         ICE_SET_EXCEPTION_FROM_CLONE(_exception, ex.ice_clone());
         _monitor.notifyAll();
@@ -673,10 +668,7 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
             out << "adapter = " << ref->getAdapterId();
         }
 
-        NotRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "object adapter";
-        ex.id = ref->getAdapterId();
-        throw ex;
+        throw NotRegisteredException(__FILE__, __LINE__, "object adapter", ref->getAdapterId());
     }
     catch(const ObjectNotFoundException&)
     {
@@ -689,10 +681,8 @@ IceInternal::LocatorInfo::getEndpointsException(const ReferencePtr& ref, const I
                                                         ref->getInstance()->toStringMode());
         }
 
-        NotRegisteredException ex(__FILE__, __LINE__);
-        ex.kindOfObject = "object";
-        ex.id = Ice::identityToString(ref->getIdentity(), ref->getInstance()->toStringMode());
-        throw ex;
+        throw NotRegisteredException(__FILE__, __LINE__, "object",
+                                     Ice::identityToString(ref->getIdentity(), ref->getInstance()->toStringMode()));
     }
     catch(const NotRegisteredException&)
     {
@@ -783,8 +773,16 @@ IceInternal::LocatorInfo::trace(const string& msg, const ReferencePtr& ref, cons
 
     const char* sep = endpoints.size() > 1 ? ":" : "";
     ostringstream o;
+#ifdef ICE_CPP11_MAPPING
+    transform(endpoints.begin(), endpoints.end(), ostream_iterator<string>(o, sep),
+              [](const EndpointPtr& endpoint)
+              {
+                  return endpoint->toString();
+              });
+#else
     transform(endpoints.begin(), endpoints.end(), ostream_iterator<string>(o, sep),
               Ice::constMemFun(&Endpoint::toString));
+#endif
     out << "endpoints = " << o.str();
 }
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_LOCATOR_INFO_H
 #define ICE_LOCATOR_INFO_H
@@ -106,7 +101,7 @@ public:
 
     private:
 
-        const ReferencePtr _ref;
+        const ReferencePtr _reference;
         const int _ttl;
         const GetEndpointsCallbackPtr _callback;
     };
@@ -128,7 +123,7 @@ public:
         virtual void send() = 0;
 
         const LocatorInfoPtr _locatorInfo;
-        const ReferencePtr _ref;
+        const ReferencePtr _reference;
 
     private:
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_LOCATOR_INFO_F_H
 #define ICE_LOCATOR_INFO_F_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -37,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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -67,7 +62,9 @@ Ice::Logger::~Logger()
 {
 }
 
-ICE_API ::Ice::LocalObject* Ice::upCast(::Ice::Logger* p) { return p; }
+/// \cond INTERNAL
+ICE_API ::Ice::LocalObject* Ice::upCast(Logger* p) { return p; }
+/// \endcond
 
 namespace Ice
 {

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
 
 #include <Ice/LoggerAdminI.h>
 #include <Ice/Initialize.h>
@@ -360,14 +355,8 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
     // In C++, LoggerAdminI does not keep a "logger" data member to avoid a hard-to-break circular
     // reference, so we retrieve the logger from Current
     //
-
     LoggerAdminLoggerIPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLoggerI, current.adapter->getCommunicator()->getLogger());
-    if(!logger)
-    {
-        // Our logger is not installed - must be a bug
-        assert(0);
-        return;
-    }
+    assert(logger);
 
     RemoteLoggerPrxPtr remoteLogger = prx->ice_twoway();
 
@@ -434,9 +423,9 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
                 {
                     rethrow_exception(e);
                 }
-                catch(const Ice::LocalException& e)
+                catch(const Ice::LocalException& le)
                 {
-                    self->deadRemoteLogger(remoteLogger, logger, e, "init");
+                    self->deadRemoteLogger(remoteLogger, logger, le, "init");
                 }
             });
     }
@@ -539,7 +528,7 @@ LoggerAdminI::destroy()
 
     //
     // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to
-    // remote logggers
+    // remote loggers
     //
     if(sendLogCommunicator)
     {
@@ -618,16 +607,16 @@ LoggerAdminI::log(const LogMessage& logMessage)
         //
         // Queue updated, now find which remote loggers want this message
         //
-        for(RemoteLoggerMap::const_iterator p = _remoteLoggerMap.begin(); p != _remoteLoggerMap.end(); ++p)
+        for(RemoteLoggerMap::const_iterator q = _remoteLoggerMap.begin(); q != _remoteLoggerMap.end(); ++q)
         {
-            const Filters& filters = p->second;
+            const Filters& filters = q->second;
 
             if(filters.messageTypes.empty() || filters.messageTypes.count(logMessage.type) != 0)
             {
                 if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) || filters.traceCategories.empty() ||
                    filters.traceCategories.count(logMessage.traceCategory) != 0)
                 {
-                    remoteLoggers.push_back(p->first);
+                    remoteLoggers.push_back(q->first);
                 }
             }
         }

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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_LOGGER_ADMIN_I_H
 #define ICE_LOGGER_ADMIN_I_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.0
+// Ice version 3.7.5
 //
 // <auto-generated>
 //
@@ -37,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 < 0
+#   if ICE_INT_VERSION % 100 < 5
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2017 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.
-//
-// **********************************************************************
 
 #include <IceUtil/Time.h>
 #include <Ice/LoggerI.h>
@@ -16,6 +11,12 @@
 #include <Ice/LocalException.h>
 #include <IceUtil/FileUtil.h>
 
+#ifdef __IBMCPP__
+// Work-around for xlC visibility bug
+// See "ifstream::tellg visibility error" thread on IBM xlC forum
+extern template class std::fpos<char*>;
+#endif
+
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
@@ -176,22 +177,22 @@ Ice::LoggerI::write(const string& message, bool indent)
                 string date = IceUtil::Time::now().toString("%Y%m%d-%H%M%S");
                 while(true)
                 {
-                    ostringstream s;
-                    s << basename << "-" << date;
+                    ostringstream oss;
+                    oss << basename << "-" << date;
                     if(id > 0)
                     {
-                        s << "-" << id;
+                        oss << "-" << id;
                     }
                     if(!ext.empty())
                     {
-                        s << "." << ext;
+                        oss << "." << ext;
                     }
-                    if(IceUtilInternal::fileExists(s.str()))
+                    if(IceUtilInternal::fileExists(oss.str()))
                     {
                         id++;
                         continue;
                     }
-                    archive = s.str();
+                    archive = oss.str();
                     break;
                 }