zeroc-ice 3.7.0 → 3.7.5

data/ext/ice/cpp/src/Ice/PropertiesAdminI.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/PropertiesAdminI.h>
 #include <Ice/Instance.h>
@@ -198,7 +193,7 @@ PropertiesAdminI::setProperties(const PropertyDict& props, const Current&)
         for(const auto& cb : callbacks)
 #else
         vector<PropertiesAdminUpdateCallbackPtr> callbacks = _updateCallbacks;
-        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator p = callbacks.begin(); p != callbacks.end(); ++p)
+        for(vector<PropertiesAdminUpdateCallbackPtr>::const_iterator q = callbacks.begin(); q != callbacks.end(); ++q)
 #endif
         {
             try
@@ -206,7 +201,7 @@ PropertiesAdminI::setProperties(const PropertyDict& props, const Current&)
 #ifdef ICE_CPP11_MAPPING
                 cb(changes);
 #else
-                (*p)->updated(changes);
+                (*q)->updated(changes);
 #endif
             }
             catch(const std::exception& ex)

data/ext/ice/cpp/src/Ice/PropertiesAdminI.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_PROPERTIES_ADMIN_I_H
 #define ICE_PROPERTIES_ADMIN_I_H

data/ext/ice/cpp/src/Ice/PropertiesF.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/PropertiesI.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/PropertiesI.h>
 #include <IceUtil/StringUtil.h>
@@ -23,7 +18,7 @@ using namespace Ice;
 using namespace IceInternal;
 
 string
-Ice::PropertiesI::getProperty(const string& key)
+Ice::PropertiesI::getProperty(const string& key) ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -40,7 +35,7 @@ Ice::PropertiesI::getProperty(const string& key)
 }
 
 string
-Ice::PropertiesI::getPropertyWithDefault(const string& key, const string& value)
+Ice::PropertiesI::getPropertyWithDefault(const string& key, const string& value) ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -57,13 +52,13 @@ Ice::PropertiesI::getPropertyWithDefault(const string& key, const string& value)
 }
 
 Int
-Ice::PropertiesI::getPropertyAsInt(const string& key)
+Ice::PropertiesI::getPropertyAsInt(const string& key) ICE_NOEXCEPT
 {
     return getPropertyAsIntWithDefault(key, 0);
 }
 
 Int
-Ice::PropertiesI::getPropertyAsIntWithDefault(const string& key, Int value)
+Ice::PropertiesI::getPropertyAsIntWithDefault(const string& key, Int value) ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -85,13 +80,13 @@ Ice::PropertiesI::getPropertyAsIntWithDefault(const string& key, Int value)
 }
 
 Ice::StringSeq
-Ice::PropertiesI::getPropertyAsList(const string& key)
+Ice::PropertiesI::getPropertyAsList(const string& key) ICE_NOEXCEPT
 {
     return getPropertyAsListWithDefault(key, StringSeq());
 }
 
 Ice::StringSeq
-Ice::PropertiesI::getPropertyAsListWithDefault(const string& key, const StringSeq& value)
+Ice::PropertiesI::getPropertyAsListWithDefault(const string& key, const StringSeq& value) ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -119,7 +114,7 @@ Ice::PropertiesI::getPropertyAsListWithDefault(const string& key, const StringSe
 }
 
 PropertyDict
-Ice::PropertiesI::getPropertiesForPrefix(const string& prefix)
+Ice::PropertiesI::getPropertiesForPrefix(const string& prefix) ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -235,7 +230,7 @@ Ice::PropertiesI::setProperty(const string& key, const string& value)
 }
 
 StringSeq
-Ice::PropertiesI::getCommandLineOptions()
+Ice::PropertiesI::getCommandLineOptions() ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -298,19 +293,19 @@ Ice::PropertiesI::load(const std::string& file)
     StringConverterPtr stringConverter = getProcessStringConverter();
 
 //
-// Metro style applications cannot access Windows registry.
+// UWP applications cannot access Windows registry.
 //
 #if defined (_WIN32) && !defined(ICE_OS_UWP)
-    if(file.find("HKLM\\") == 0)
+    if(file.find("HKCU\\") == 0 || file.find("HKLM\\") == 0)
     {
+        HKEY key = file.find("HKCU\\") == 0 ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
         HKEY iceKey;
-        const wstring keyName = stringToWstring(file, stringConverter).substr(5).c_str();
+        const wstring keyName = stringToWstring(file, stringConverter).substr(file.find("\\") + 1).c_str();
         LONG err;
-        if((err = RegOpenKeyExW(HKEY_LOCAL_MACHINE, keyName.c_str(), 0, KEY_QUERY_VALUE, &iceKey)) != ERROR_SUCCESS)
+        if((err = RegOpenKeyExW(key, keyName.c_str(), 0, KEY_QUERY_VALUE, &iceKey)) != ERROR_SUCCESS)
         {
-            InitializationException ex(__FILE__, __LINE__);
-            ex.reason = "could not open Windows registry key `" + file + "':\n" + IceUtilInternal::errorToString(err);
-            throw ex;
+            throw InitializationException(__FILE__, __LINE__, "could not open Windows registry key `" + file + "':\n" +
+                                          IceUtilInternal::errorToString(err));
         }
 
         DWORD maxNameSize; // Size in characters not including terminating null character.
@@ -318,14 +313,12 @@ Ice::PropertiesI::load(const std::string& file)
         DWORD numValues;
         try
         {
-            err = RegQueryInfoKey(iceKey, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, &numValues, &maxNameSize, &maxDataSize,
-                                  ICE_NULLPTR, ICE_NULLPTR);
+            err = RegQueryInfoKey(iceKey, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR, ICE_NULLPTR,
+                                  &numValues, &maxNameSize, &maxDataSize, ICE_NULLPTR, ICE_NULLPTR);
             if(err != ERROR_SUCCESS)
             {
-                InitializationException ex(__FILE__, __LINE__);
-                ex.reason = "could not open Windows registry key `" + file + "':\n";
-                ex.reason += IceUtilInternal::errorToString(err);
-                throw ex;
+                throw InitializationException(__FILE__, __LINE__, "could not open Windows registry key `" + file +
+                                              "':\n" + IceUtilInternal::errorToString(err));
             }
 
             for(DWORD i = 0; i < numValues; ++i)
@@ -403,10 +396,7 @@ Ice::PropertiesI::load(const std::string& file)
         ifstream in(IceUtilInternal::streamFilename(file).c_str());
         if(!in)
         {
-            FileException ex(__FILE__, __LINE__);
-            ex.path = file;
-            ex.error = getSystemErrno();
-            throw ex;
+            throw FileException(__FILE__, __LINE__, getSystemErrno(), file);
         }
 
         string line;
@@ -420,9 +410,9 @@ Ice::PropertiesI::load(const std::string& file)
             {
                 const unsigned char UTF8_BOM[3] = {0xEF, 0xBB, 0xBF};
                 if(line.size() >= 3 &&
-                   static_cast<const unsigned char>(line[0]) == UTF8_BOM[0] &&
-                   static_cast<const unsigned char>(line[1]) == UTF8_BOM[1] &&
-                   static_cast<const unsigned char>(line[2]) == UTF8_BOM[2])
+                   static_cast<unsigned char>(line[0]) == UTF8_BOM[0] &&
+                   static_cast<unsigned char>(line[1]) == UTF8_BOM[1] &&
+                   static_cast<unsigned char>(line[2]) == UTF8_BOM[2])
                 {
                     line = line.substr(3);
                 }
@@ -434,7 +424,7 @@ Ice::PropertiesI::load(const std::string& file)
 }
 
 PropertiesPtr
-Ice::PropertiesI::clone()
+Ice::PropertiesI::clone() ICE_NOEXCEPT
 {
     IceUtil::Mutex::Lock sync(*this);
     return ICE_MAKE_SHARED(PropertiesI, this);

data/ext/ice/cpp/src/Ice/PropertiesI.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_PROPERTIES_I_H
 #define ICE_PROPERTIES_I_H
@@ -23,20 +18,20 @@ class PropertiesI : public Properties, public IceUtil::Mutex
 {
 public:
 
-    virtual std::string getProperty(const std::string&);
-    virtual std::string getPropertyWithDefault(const std::string&, const std::string&);
-    virtual Ice::Int getPropertyAsInt(const std::string&);
-    virtual Ice::Int getPropertyAsIntWithDefault(const std::string&, Ice::Int);
-    virtual Ice::StringSeq getPropertyAsList(const std::string&);
-    virtual Ice::StringSeq getPropertyAsListWithDefault(const std::string&, const Ice::StringSeq&);
+    virtual std::string getProperty(const std::string&) ICE_NOEXCEPT;
+    virtual std::string getPropertyWithDefault(const std::string&, const std::string&) ICE_NOEXCEPT;
+    virtual Ice::Int getPropertyAsInt(const std::string&) ICE_NOEXCEPT;
+    virtual Ice::Int getPropertyAsIntWithDefault(const std::string&, Ice::Int) ICE_NOEXCEPT;
+    virtual Ice::StringSeq getPropertyAsList(const std::string&) ICE_NOEXCEPT;
+    virtual Ice::StringSeq getPropertyAsListWithDefault(const std::string&, const Ice::StringSeq&) ICE_NOEXCEPT;
 
-    virtual PropertyDict getPropertiesForPrefix(const std::string&);
+    virtual PropertyDict getPropertiesForPrefix(const std::string&) ICE_NOEXCEPT;
     virtual void setProperty(const std::string&, const std::string&);
-    virtual StringSeq getCommandLineOptions();
+    virtual StringSeq getCommandLineOptions() ICE_NOEXCEPT;
     virtual StringSeq parseCommandLineOptions(const std::string&, const StringSeq&);
     virtual StringSeq parseIceCommandLineOptions(const StringSeq&);
     virtual void load(const std::string&);
-    virtual PropertiesPtr clone();
+    virtual PropertiesPtr clone() ICE_NOEXCEPT;
 
     std::set<std::string> getUnusedProperties();
 

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

@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue May 16 17:04:55 2017
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul  2 14:55:02 2020
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -14,6 +9,7 @@
 
 const IceInternal::Property IcePropsData[] =
 {
+    IceInternal::Property("Ice.AcceptClassCycles", false, 0),
     IceInternal::Property("Ice.ACM.Client", true, 0),
     IceInternal::Property("Ice.ACM.Server", true, 0),
     IceInternal::Property("Ice.ACM.Timeout", false, 0),
@@ -180,7 +176,9 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.TCP.RcvSize", false, 0),
     IceInternal::Property("Ice.TCP.SndSize", false, 0),
     IceInternal::Property("Ice.UseApplicationClassLoader", false, 0),
+    IceInternal::Property("Ice.UseOSLog", false, 0),
     IceInternal::Property("Ice.UseSyslog", false, 0),
+    IceInternal::Property("Ice.UseSystemdJournal", false, 0),
     IceInternal::Property("Ice.Warn.AMICallback", false, 0),
     IceInternal::Property("Ice.Warn.Connections", false, 0),
     IceInternal::Property("Ice.Warn.Datagrams", false, 0),
@@ -190,7 +188,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Warn.UnusedProperties", false, 0),
     IceInternal::Property("Ice.CacheMessageBuffers", false, 0),
     IceInternal::Property("Ice.ThreadInterruptSafe", false, 0),
-    IceInternal::Property("Ice.Voip", false, 0),
+    IceInternal::Property("Ice.Voip", true, 0),
 };
 
 const IceInternal::PropertyArray
@@ -422,6 +420,7 @@ const IceInternal::Property IceLocatorDiscoveryPropsData[] =
     IceInternal::Property("IceLocatorDiscovery.Port", false, 0),
     IceInternal::Property("IceLocatorDiscovery.Interface", false, 0),
     IceInternal::Property("IceLocatorDiscovery.InstanceName", false, 0),
+    IceInternal::Property("IceLocatorDiscovery.Trace.Lookup", false, 0),
 };
 
 const IceInternal::PropertyArray
@@ -528,6 +527,43 @@ const IceInternal::Property IceGridAdminPropsData[] =
     IceInternal::Property("IceGridAdmin.Host", false, 0),
     IceInternal::Property("IceGridAdmin.Port", false, 0),
     IceInternal::Property("IceGridAdmin.InstanceName", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Timeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Heartbeat", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM.Close", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ACM", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.AdapterId", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Endpoints", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.PreferSecure", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.InvocationTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.CollocationOptimized", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator.Context.*", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.EndpointSelection", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.ConnectionCached", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.PreferSecure", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.InvocationTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.CollocationOptimized", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router.Context.*", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ProxyOptions", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadIdleTime", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceGridAdmin.Server.MessageSizeMax", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Address", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Interface", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Lookup", false, 0),
@@ -1002,6 +1038,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Trace.Admin", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Application", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Adapter", false, 0),
+    IceInternal::Property("IceGrid.Registry.Trace.Discovery", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Locator", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Node", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.Object", false, 0),

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

@@ -1,12 +1,7 @@
-// **********************************************************************
 //
-// 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.
-//
-// **********************************************************************
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue May 16 17:04:55 2017
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Thu Jul  2 14:55:02 2020
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 

data/ext/ice/cpp/src/Ice/Protocol.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/Protocol.h>
 #include <Ice/LocalException.h>
@@ -68,34 +63,26 @@ stringToMajorMinor(const std::string& str, Ice::Byte& major, Ice::Byte& minor)
     std::string::size_type pos = str.find_first_of(".");
     if(pos == std::string::npos)
     {
-        Ice::VersionParseException ex(__FILE__, __LINE__);
-        ex.str = "malformed version value `" + str + "'";
-        throw ex;
+        throw Ice::VersionParseException(__FILE__, __LINE__, "malformed version value `" + str + "'");
     }
 
     std::istringstream majStr(str.substr(0, pos));
     Ice::Int majVersion;
     if(!(majStr >> majVersion) || !majStr.eof())
     {
-        Ice::VersionParseException ex(__FILE__, __LINE__);
-        ex.str = "invalid major version value `" + str + "'";
-        throw ex;
+        throw Ice::VersionParseException(__FILE__, __LINE__, "invalid major version value `" + str + "'");
     }
 
     std::istringstream minStr(str.substr(pos + 1, std::string::npos));
     Ice::Int minVersion;
     if(!(minStr >> minVersion) || !minStr.eof())
     {
-        Ice::VersionParseException ex(__FILE__, __LINE__);
-        ex.str = "invalid minor version value `" + str + "'";
-        throw ex;
+        throw Ice::VersionParseException(__FILE__, __LINE__, "invalid minor version value `" + str + "'");
     }
 
     if(majVersion < 1 || majVersion > 255 || minVersion < 0 || minVersion > 255)
     {
-        Ice::VersionParseException ex(__FILE__, __LINE__);
-        ex.str = "range error in version `" + str + "'";
-        throw ex;
+        throw Ice::VersionParseException(__FILE__, __LINE__, "range error in version `" + str + "'");
     }
 
     major = static_cast<Ice::Byte>(majVersion);

data/ext/ice/cpp/src/Ice/ProtocolInstance.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/ProtocolInstance.h>
 #include <Ice/Instance.h>