zeroc-ice 3.7.1 → 3.7.2

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_INCOMING_REQUEST_H
 #define ICE_INCOMING_REQUEST_H

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

@@ -1,14 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/ArgVector.h>
-#include <IceUtil/DisableWarnings.h>
 #include <Ice/CommunicatorI.h>
 #include <Ice/PropertiesI.h>
 #include <Ice/Initialize.h>

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/InputStream.h>
@@ -224,22 +219,22 @@ Ice::InputStream::setCompactIdResolver(const CompactIdResolverPtr& r)
 
 #ifndef ICE_CPP11_MAPPING
 void
-Ice::InputStream::setCollectObjects(bool b)
+Ice::InputStream::setCollectObjects(bool on)
 {
-    _collectObjects = b;
+    _collectObjects = on;
 }
 #endif
 
 void
-Ice::InputStream::setSliceValues(bool b)
+Ice::InputStream::setSliceValues(bool on)
 {
-    _sliceValues = b;
+    _sliceValues = on;
 }
 
 void
-Ice::InputStream::setTraceSlicing(bool b)
+Ice::InputStream::setTraceSlicing(bool on)
 {
-    _traceSlicing = b;
+    _traceSlicing = on;
 }
 
 void
@@ -988,16 +983,6 @@ Ice::InputStream::read(Double& v)
     *dest = *src;
 #else
     Byte* dest = reinterpret_cast<Byte*>(&v);
-#  if defined(ICE_LITTLEBYTE_BIGWORD)
-    dest[4] = *src++;
-    dest[5] = *src++;
-    dest[6] = *src++;
-    dest[7] = *src++;
-    dest[0] = *src++;
-    dest[1] = *src++;
-    dest[2] = *src++;
-    dest[3] = *src;
-#  else
     *dest++ = *src++;
     *dest++ = *src++;
     *dest++ = *src++;
@@ -1006,7 +991,6 @@ Ice::InputStream::read(Double& v)
     *dest++ = *src++;
     *dest++ = *src++;
     *dest = *src;
-#  endif
 #endif
 }
 
@@ -1034,21 +1018,6 @@ Ice::InputStream::read(vector<Double>& v)
             *dest-- = *src++;
             dest += 2 * sizeof(Double);
         }
-#elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&v[0]);
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
 #else
         copy(begin, i, reinterpret_cast<Byte*>(&v[0]));
 #endif
@@ -1104,22 +1073,6 @@ Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArr
             *dest-- = *src++;
             dest += 2 * sizeof(Double);
         }
-#  elif defined(ICE_LITTLEBYTE_BIGWORD)
-        const Byte* src = &(*begin);
-        Byte* dest = reinterpret_cast<Byte*>(&result[0]);
-        for(int j = 0 ; j < sz ; ++j)
-        {
-            dest[4] = *src++;
-            dest[5] = *src++;
-            dest[6] = *src++;
-            dest[7] = *src++;
-            dest[0] = *src++;
-            dest[1] = *src++;
-            dest[2] = *src++;
-            dest[3] = *src++;
-            dest += sizeof(Double);
-        }
-
 #  else
         copy(begin, i, reinterpret_cast<Byte*>(&result[0]));
 #  endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/Instance.h>
 #include <Ice/TraceLevels.h>
@@ -58,6 +53,7 @@
 
 #ifndef _WIN32
 #   include <Ice/SysLoggerI.h>
+#   include <Ice/SystemdJournalI.h>
 
 #   include <signal.h>
 #   include <syslog.h>
@@ -1100,6 +1096,13 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
                                                    _initData.properties->getProperty("Ice.ProgramName"),
                                                    _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER"));
             }
+#   ifdef ICE_USE_SYSTEMD
+            else if(_initData.properties->getPropertyAsInt("Ice.UseSystemdJournal") > 0)
+            {
+                _initData.logger = ICE_MAKE_SHARED(SystemdJournalI,
+                                                   _initData.properties->getProperty("Ice.ProgramName"));
+            }
+#   endif
             else
 #endif
             if(!logfile.empty())
@@ -1453,6 +1456,18 @@ IceInternal::Instance::finishSetup(int& argc, const char* argv[], const Ice::Com
     try
     {
         _endpointHostResolver = new EndpointHostResolver(this);
+#ifndef ICE_OS_UWP
+        bool hasPriority = _initData.properties->getProperty("Ice.ThreadPriority") != "";
+        int priority = _initData.properties->getPropertyAsInt("Ice.ThreadPriority");
+        if(hasPriority)
+        {
+            _endpointHostResolver->start(0, priority);
+        }
+        else
+        {
+            _endpointHostResolver->start();
+        }
+#endif
     }
     catch(const IceUtil::Exception& ex)
     {
@@ -1652,8 +1667,15 @@ IceInternal::Instance::destroy()
     }
 #endif
 
+#ifdef ICE_CPP11_COMPILER
+    for(const auto& p : _objectFactoryMap)
+    {
+        p.second->destroy();
+    }
+#else
     for_each(_objectFactoryMap.begin(), _objectFactoryMap.end(),
         Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
+#endif
     _objectFactoryMap.clear();
 
     if(_routerManager)
@@ -1826,9 +1848,9 @@ IceInternal::Instance::addObjectFactory(const Ice::ObjectFactoryPtr& factory, co
     // with the value factory manager. This may raise AlreadyRegisteredException.
     //
 #ifdef ICE_CPP11_MAPPING
-    _initData.valueFactoryManager->add([factory](const string& id)
+    _initData.valueFactoryManager->add([factory](const string& ident)
                                        {
-                                           return factory->create(id);
+                                           return factory->create(ident);
                                        },
                                        id);
 #else

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_INSTANCE_H
 #define ICE_INSTANCE_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -42,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -40,7 +35,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/InstrumentationI.h>
 
@@ -52,7 +47,7 @@ getThreadStateMetric(ThreadState s)
 
 struct ThreadStateChanged
 {
-    ThreadStateChanged(ThreadState oldState, ThreadState newState) : oldState(oldState), newState(newState)
+    ThreadStateChanged(ThreadState oldStateP, ThreadState newStateP) : oldState(oldStateP), newState(newStateP)
     {
     }
 

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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_INSTRUMENTATION_I_H
 #define ICE_INSTRUMENTATION_I_H

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -42,7 +37,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif

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

@@ -1,11 +1,6 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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/LocalObject.h>
 

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

@@ -1,13 +1,8 @@
-// **********************************************************************
 //
-// Copyright (c) 2003-2018 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.1
+// Ice version 3.7.2
 //
 // <auto-generated>
 //
@@ -46,7 +41,7 @@
 #   if ICE_INT_VERSION % 100 > 50
 #       error Beta header file detected
 #   endif
-#   if ICE_INT_VERSION % 100 < 1
+#   if ICE_INT_VERSION % 100 < 2
 #       error Ice patch level mismatch!
 #   endif
 #endif
@@ -205,7 +200,7 @@ Ice::Locator::ice_staticId()
 bool
 Ice::Locator::_iceD_findObjectById(::IceInternal::Incoming& inS, const Current& current) const
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
     Identity iceP_id;
     istr->readAll(iceP_id);
@@ -227,7 +222,7 @@ Ice::Locator::_iceD_findObjectById(::IceInternal::Incoming& inS, const Current&
 bool
 Ice::Locator::_iceD_findAdapterById(::IceInternal::Incoming& inS, const Current& current) const
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_id;
     istr->readAll(iceP_id);
@@ -249,7 +244,7 @@ Ice::Locator::_iceD_findAdapterById(::IceInternal::Incoming& inS, const Current&
 bool
 Ice::Locator::_iceD_getRegistry(::IceInternal::Incoming& inS, const Current& current) const
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     inS.readEmptyParams();
     ::std::shared_ptr<LocatorRegistryPrx> ret = this->getRegistry(current);
     auto ostr = inS.startWriteParams();
@@ -337,7 +332,7 @@ Ice::LocatorRegistry::ice_staticId()
 bool
 Ice::LocatorRegistry::_iceD_setAdapterDirectProxy(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_id;
     ::std::shared_ptr<ObjectPrx> iceP_proxy;
@@ -353,7 +348,7 @@ Ice::LocatorRegistry::_iceD_setAdapterDirectProxy(::IceInternal::Incoming& inS,
 bool
 Ice::LocatorRegistry::_iceD_setReplicatedAdapterDirectProxy(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_adapterId;
     ::std::string iceP_replicaGroupId;
@@ -370,7 +365,7 @@ Ice::LocatorRegistry::_iceD_setReplicatedAdapterDirectProxy(::IceInternal::Incom
 bool
 Ice::LocatorRegistry::_iceD_setServerProcessProxy(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(OperationMode::Idempotent, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Idempotent, current.mode);
     auto istr = inS.startReadParams();
     ::std::string iceP_id;
     ::std::shared_ptr<ProcessPrx> iceP_proxy;
@@ -460,7 +455,7 @@ Ice::LocatorFinder::ice_staticId()
 bool
 Ice::LocatorFinder::_iceD_getLocator(::IceInternal::Incoming& inS, const Current& current)
 {
-    _iceCheckMode(OperationMode::Normal, current.mode);
+    _iceCheckMode(::Ice::OperationMode::Normal, current.mode);
     inS.readEmptyParams();
     ::std::shared_ptr<LocatorPrx> ret = this->getLocator(current);
     auto ostr = inS.startWriteParams();
@@ -516,7 +511,7 @@ void
 Ice::LocatorPrx::_iceI_findObjectById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>& outAsync, const Identity& iceP_id, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Locator_findObjectById_name);
-    outAsync->invoke(iceC_Ice_Locator_findObjectById_name, OperationMode::Nonmutating, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_Locator_findObjectById_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
         [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_id);
@@ -543,7 +538,7 @@ void
 Ice::LocatorPrx::_iceI_findAdapterById(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<ObjectPrx>>>& outAsync, const ::std::string& iceP_id, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Locator_findAdapterById_name);
-    outAsync->invoke(iceC_Ice_Locator_findAdapterById_name, OperationMode::Nonmutating, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_Locator_findAdapterById_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
         [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_id);
@@ -570,7 +565,7 @@ void
 Ice::LocatorPrx::_iceI_getRegistry(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<LocatorRegistryPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_Locator_getRegistry_name);
-    outAsync->invoke(iceC_Ice_Locator_getRegistry_name, OperationMode::Nonmutating, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_Locator_getRegistry_name, ::Ice::OperationMode::Nonmutating, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }
@@ -595,7 +590,7 @@ void
 Ice::LocatorRegistryPrx::_iceI_setAdapterDirectProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_id, const ::std::shared_ptr<ObjectPrx>& iceP_proxy, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name);
-    outAsync->invoke(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name, OperationMode::Idempotent, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_LocatorRegistry_setAdapterDirectProxy_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
         [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_id, iceP_proxy);
@@ -626,7 +621,7 @@ void
 Ice::LocatorRegistryPrx::_iceI_setReplicatedAdapterDirectProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_adapterId, const ::std::string& iceP_replicaGroupId, const ::std::shared_ptr<ObjectPrx>& iceP_p, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name);
-    outAsync->invoke(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name, OperationMode::Idempotent, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_LocatorRegistry_setReplicatedAdapterDirectProxy_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
         [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_adapterId, iceP_replicaGroupId, iceP_p);
@@ -661,7 +656,7 @@ void
 Ice::LocatorRegistryPrx::_iceI_setServerProcessProxy(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<void>>& outAsync, const ::std::string& iceP_id, const ::std::shared_ptr<ProcessPrx>& iceP_proxy, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_LocatorRegistry_setServerProcessProxy_name);
-    outAsync->invoke(iceC_Ice_LocatorRegistry_setServerProcessProxy_name, OperationMode::Idempotent, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_LocatorRegistry_setServerProcessProxy_name, ::Ice::OperationMode::Idempotent, ::Ice::FormatType::DefaultFormat, context,
         [&](OutputStream* ostr)
         {
             ostr->writeAll(iceP_id, iceP_proxy);
@@ -702,7 +697,7 @@ void
 Ice::LocatorFinderPrx::_iceI_getLocator(const ::std::shared_ptr<::IceInternal::OutgoingAsyncT<::std::shared_ptr<LocatorPrx>>>& outAsync, const Context& context)
 {
     _checkTwowayOnly(iceC_Ice_LocatorFinder_getLocator_name);
-    outAsync->invoke(iceC_Ice_LocatorFinder_getLocator_name, OperationMode::Normal, FormatType::DefaultFormat, context,
+    outAsync->invoke(iceC_Ice_LocatorFinder_getLocator_name, ::Ice::OperationMode::Normal, ::Ice::FormatType::DefaultFormat, context,
         nullptr,
         nullptr);
 }