zeroc-ice 3.6.5 → 3.7.0

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -12,7 +12,7 @@
 
 #include <IceUtil/Mutex.h>
 #include <Ice/Properties.h>
-#include <IceUtil/StringConverter.h>
+#include <Ice/StringConverter.h>
 
 #include <set>
 
@@ -22,7 +22,7 @@ namespace Ice
 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&);
@@ -40,16 +40,14 @@ public:
 
     std::set<std::string> getUnusedProperties();
 
-private:
-    PropertiesI(const IceUtil::StringConverterPtr&);
-    PropertiesI(StringSeq&, const PropertiesPtr&, const IceUtil::StringConverterPtr&);
     PropertiesI(const PropertiesI*);
 
-    friend ICE_API PropertiesPtr createProperties();
-    friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&);
-    friend ICE_API PropertiesPtr createProperties(int&, char*[], const PropertiesPtr&);
+    PropertiesI();
+    PropertiesI(StringSeq&, const PropertiesPtr&);
+
+private:
 
-    void parseLine(const std::string&, const IceUtil::StringConverterPtr&);
+    void parseLine(const std::string&, const StringConverterPtr&);
 
     void loadConfig();
 
@@ -70,7 +68,6 @@ private:
         bool used;
     };
     std::map<std::string, PropertyValue> _properties;
-    const IceUtil::StringConverterPtr _converter;
 };
 
 }

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

@@ -1,12 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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, Wed Jan 16 12:48:30 2019
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue May 16 17:04:55 2017
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -138,6 +138,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.Plugin.*", false, 0),
     IceInternal::Property("Ice.PluginLoadOrder", false, 0),
     IceInternal::Property("Ice.PreferIPv6Address", false, 0),
+    IceInternal::Property("Ice.PreloadAssemblies", false, 0),
     IceInternal::Property("Ice.PrintAdapterReady", false, 0),
     IceInternal::Property("Ice.PrintProcessId", false, 0),
     IceInternal::Property("Ice.PrintStackTraces", false, 0),
@@ -164,6 +165,7 @@ const IceInternal::Property IcePropsData[] =
     IceInternal::Property("Ice.ThreadPool.Server.ThreadIdleTime", false, 0),
     IceInternal::Property("Ice.ThreadPool.Server.ThreadPriority", false, 0),
     IceInternal::Property("Ice.ThreadPriority", false, 0),
+    IceInternal::Property("Ice.ToStringMode", false, 0),
     IceInternal::Property("Ice.Trace.Admin.Properties", false, 0),
     IceInternal::Property("Ice.Trace.Admin.Logger", false, 0),
     IceInternal::Property("Ice.Trace.Locator", false, 0),
@@ -469,6 +471,53 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceBoxAdminProps(IceBoxAdminPropsData,
                                                 sizeof(IceBoxAdminPropsData)/sizeof(IceBoxAdminPropsData[0]));
 
+const IceInternal::Property IceBridgePropsData[] =
+{
+    IceInternal::Property("IceBridge.Source.ACM.Timeout", false, 0),
+    IceInternal::Property("IceBridge.Source.ACM.Heartbeat", false, 0),
+    IceInternal::Property("IceBridge.Source.ACM.Close", false, 0),
+    IceInternal::Property("IceBridge.Source.ACM", false, 0),
+    IceInternal::Property("IceBridge.Source.AdapterId", false, 0),
+    IceInternal::Property("IceBridge.Source.Endpoints", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.PreferSecure", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.InvocationTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.Locator", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.Router", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.CollocationOptimized", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator.Context.*", false, 0),
+    IceInternal::Property("IceBridge.Source.Locator", false, 0),
+    IceInternal::Property("IceBridge.Source.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceBridge.Source.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.EndpointSelection", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.ConnectionCached", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.PreferSecure", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.InvocationTimeout", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.Locator", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.Router", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.CollocationOptimized", false, 0),
+    IceInternal::Property("IceBridge.Source.Router.Context.*", false, 0),
+    IceInternal::Property("IceBridge.Source.Router", false, 0),
+    IceInternal::Property("IceBridge.Source.ProxyOptions", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadIdleTime", false, 0),
+    IceInternal::Property("IceBridge.Source.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceBridge.Source.MessageSizeMax", false, 0),
+    IceInternal::Property("IceBridge.Target.Endpoints", false, 0),
+    IceInternal::Property("IceBridge.InstanceName", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceBridgeProps(IceBridgePropsData,
+                                                sizeof(IceBridgePropsData)/sizeof(IceBridgePropsData[0]));
+
 const IceInternal::Property IceGridAdminPropsData[] =
 {
     IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0),
@@ -479,43 +528,6 @@ 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),
@@ -556,6 +568,43 @@ const IceInternal::Property IceGridAdminPropsData[] =
     IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadIdleTime", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Reply.ThreadPool.ThreadPriority", false, 0),
     IceInternal::Property("IceGridAdmin.Discovery.Reply.MessageSizeMax", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Timeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Heartbeat", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM.Close", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ACM", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.AdapterId", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Endpoints", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.EndpointSelection", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.ConnectionCached", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.PreferSecure", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.InvocationTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.CollocationOptimized", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator.Context.*", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.PublishedEndpoints", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ReplicaGroupId", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.EndpointSelection", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.ConnectionCached", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.PreferSecure", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.LocatorCacheTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.InvocationTimeout", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Locator", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.CollocationOptimized", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router.Context.*", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.Router", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ProxyOptions", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Size", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeMax", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.SizeWarn", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.StackSize", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.Serialize", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadIdleTime", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.ThreadPool.ThreadPriority", false, 0),
+    IceInternal::Property("IceGridAdmin.Discovery.Locator.MessageSizeMax", false, 0),
     IceInternal::Property("IceGridAdmin.Trace.Observers", false, 0),
     IceInternal::Property("IceGridAdmin.Trace.SaveToRegistry", false, 0),
 };
@@ -654,6 +703,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Node.RedirectErrToOut", false, 0),
     IceInternal::Property("IceGrid.Node.Trace.Activator", false, 0),
     IceInternal::Property("IceGrid.Node.Trace.Adapter", false, 0),
+    IceInternal::Property("IceGrid.Node.Trace.Admin", false, 0),
     IceInternal::Property("IceGrid.Node.Trace.Patch", false, 0),
     IceInternal::Property("IceGrid.Node.Trace.Replica", false, 0),
     IceInternal::Property("IceGrid.Node.Trace.Server", false, 0),
@@ -766,7 +816,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Client.ThreadPool.ThreadPriority", false, 0),
     IceInternal::Property("IceGrid.Registry.Client.MessageSizeMax", false, 0),
     IceInternal::Property("IceGrid.Registry.CryptPasswords", false, 0),
-    IceInternal::Property("IceGrid.Registry.Data", false, 0),
     IceInternal::Property("IceGrid.Registry.DefaultTemplates", false, 0),
     IceInternal::Property("IceGrid.Registry.Discovery.ACM.Timeout", false, 0),
     IceInternal::Property("IceGrid.Registry.Discovery.ACM.Heartbeat", false, 0),
@@ -847,6 +896,8 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadIdleTime", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.ThreadPool.ThreadPriority", false, 0),
     IceInternal::Property("IceGrid.Registry.Internal.MessageSizeMax", false, 0),
+    IceInternal::Property("IceGrid.Registry.LMDB.MapSize", false, 0),
+    IceInternal::Property("IceGrid.Registry.LMDB.Path", false, 0),
     IceInternal::Property("IceGrid.Registry.NodeSessionTimeout", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.EndpointSelection", false, 0),
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier.ConnectionCached", false, 0),
@@ -948,6 +999,7 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.CollocationOptimized", false, 0),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier.Context.*", false, 0),
     IceInternal::Property("IceGrid.Registry.SSLPermissionsVerifier", false, 0),
+    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.Locator", false, 0),
@@ -961,13 +1013,6 @@ const IceInternal::Property IceGridPropsData[] =
     IceInternal::Property("IceGrid.Registry.Trace.Topic", false, 0),
     IceInternal::Property("IceGrid.Registry.Trace.TopicManager", false, 0),
     IceInternal::Property("IceGrid.Registry.UserAccounts", false, 0),
-    IceInternal::Property("IceGrid.SQL.DatabaseType", false, 0),
-    IceInternal::Property("IceGrid.SQL.EncodingVersion", false, 0),
-    IceInternal::Property("IceGrid.SQL.HostName", false, 0),
-    IceInternal::Property("IceGrid.SQL.Port", false, 0),
-    IceInternal::Property("IceGrid.SQL.DatabaseName", false, 0),
-    IceInternal::Property("IceGrid.SQL.UserName", false, 0),
-    IceInternal::Property("IceGrid.SQL.Password", false, 0),
 };
 
 const IceInternal::PropertyArray
@@ -1053,10 +1098,8 @@ const IceInternal::Property IceSSLPropsData[] =
     IceInternal::Property("IceSSL.EntropyDaemon", false, 0),
     IceInternal::Property("IceSSL.FindCert", false, 0),
     IceInternal::Property("IceSSL.FindCert.*", true, 0),
-    IceInternal::Property("IceSSL.ImportCert.*", true, 0),
     IceInternal::Property("IceSSL.InitOpenSSL", false, 0),
     IceInternal::Property("IceSSL.KeyFile", true, 0),
-    IceInternal::Property("IceSSL.KeySet", true, 0),
     IceInternal::Property("IceSSL.Keychain", false, 0),
     IceInternal::Property("IceSSL.KeychainPassword", false, 0),
     IceInternal::Property("IceSSL.Keystore", false, 0),
@@ -1065,11 +1108,11 @@ const IceInternal::Property IceSSLPropsData[] =
     IceInternal::Property("IceSSL.Password", false, 0),
     IceInternal::Property("IceSSL.PasswordCallback", false, 0),
     IceInternal::Property("IceSSL.PasswordRetryMax", false, 0),
-    IceInternal::Property("IceSSL.PersistKeySet", true, 0),
     IceInternal::Property("IceSSL.Protocols", false, 0),
     IceInternal::Property("IceSSL.ProtocolVersionMax", false, 0),
     IceInternal::Property("IceSSL.ProtocolVersionMin", false, 0),
     IceInternal::Property("IceSSL.Random", false, 0),
+    IceInternal::Property("IceSSL.SchannelStrongCrypto", false, 0),
     IceInternal::Property("IceSSL.Trace.Security", false, 0),
     IceInternal::Property("IceSSL.TrustOnly", false, 0),
     IceInternal::Property("IceSSL.TrustOnly.Client", false, 0),
@@ -1098,6 +1141,16 @@ const IceInternal::PropertyArray
     IceInternal::PropertyNames::IceStormAdminProps(IceStormAdminPropsData,
                                                 sizeof(IceStormAdminPropsData)/sizeof(IceStormAdminPropsData[0]));
 
+const IceInternal::Property IceBTPropsData[] =
+{
+    IceInternal::Property("IceBT.RcvSize", false, 0),
+    IceInternal::Property("IceBT.SndSize", false, 0),
+};
+
+const IceInternal::PropertyArray
+    IceInternal::PropertyNames::IceBTProps(IceBTPropsData,
+                                                sizeof(IceBTPropsData)/sizeof(IceBTPropsData[0]));
+
 const IceInternal::Property Glacier2PropsData[] =
 {
     IceInternal::Property("Glacier2.AddConnectionContext", false, 0),
@@ -1300,12 +1353,14 @@ const IceInternal::PropertyArray IceInternal::PropertyNames::validProps[] =
     IceLocatorDiscoveryProps,
     IceBoxProps,
     IceBoxAdminProps,
+    IceBridgeProps,
     IceGridAdminProps,
     IceGridProps,
     IcePatch2Props,
     IcePatch2ClientProps,
     IceSSLProps,
     IceStormAdminProps,
+    IceBTProps,
     Glacier2Props,
     Glacier2CryptPermissionsVerifierProps,
     FreezeProps,
@@ -1320,12 +1375,14 @@ const char* IceInternal::PropertyNames::clPropNames[] =
     "IceLocatorDiscovery",
     "IceBox",
     "IceBoxAdmin",
+    "IceBridge",
     "IceGridAdmin",
     "IceGrid",
     "IcePatch2",
     "IcePatch2Client",
     "IceSSL",
     "IceStormAdmin",
+    "IceBT",
     "Glacier2",
     "Glacier2CryptPermissionsVerifier",
     "Freeze",

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

@@ -1,12 +1,12 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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, Wed Jan 16 12:48:30 2019
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue May 16 17:04:55 2017
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -62,12 +62,14 @@ public:
     static const PropertyArray IceLocatorDiscoveryProps;
     static const PropertyArray IceBoxProps;
     static const PropertyArray IceBoxAdminProps;
+    static const PropertyArray IceBridgeProps;
     static const PropertyArray IceGridAdminProps;
     static const PropertyArray IceGridProps;
     static const PropertyArray IcePatch2Props;
     static const PropertyArray IcePatch2ClientProps;
     static const PropertyArray IceSSLProps;
     static const PropertyArray IceStormAdminProps;
+    static const PropertyArray IceBTProps;
     static const PropertyArray Glacier2Props;
     static const PropertyArray Glacier2CryptPermissionsVerifierProps;
     static const PropertyArray FreezeProps;

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -121,11 +121,11 @@ namespace Ice
 
 const EncodingVersion currentEncoding = { IceInternal::encodingMajor, IceInternal::encodingMinor };
 const ProtocolVersion currentProtocol = { IceInternal::protocolMajor, IceInternal::protocolMinor };
-
 //
 // The encoding to use for protocol messages, this version is tied to
 // the protocol version.
 //
+
 const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor,
                                                   IceInternal::protocolEncodingMinor };
 

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

@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2018 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2017 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.
@@ -13,6 +13,7 @@
 #include <Ice/IPEndpointI.h>
 #include <Ice/DefaultsAndOverrides.h>
 #include <Ice/TraceLevels.h>
+#include <Ice/EndpointFactoryManager.h>
 
 using namespace std;
 using namespace Ice;
@@ -20,6 +21,11 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ProtocolInstance* p) { return p; }
 
+IceInternal::ProtocolInstance::~ProtocolInstance()
+{
+    // Out of line to avoid weak vtable
+}
+
 IceInternal::ProtocolInstance::ProtocolInstance(const CommunicatorPtr& com, Short type, const string& protocol,
                                                  bool secure) :
     _instance(getInstance(com)),
@@ -44,6 +50,36 @@ IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Sho
 {
 }
 
+const LoggerPtr&
+IceInternal::ProtocolInstance::logger() const
+{
+    return _instance->initializationData().logger;
+}
+
+EndpointFactoryPtr
+IceInternal::ProtocolInstance::getEndpointFactory(Ice::Short type) const
+{
+    return _instance->endpointFactoryManager()->get(type);
+}
+
+BufSizeWarnInfo
+IceInternal::ProtocolInstance::getBufSizeWarn(Short type)
+{
+    return _instance->getBufSizeWarn(type);
+}
+
+void
+IceInternal::ProtocolInstance::setSndBufSizeWarn(Short type, int size)
+{
+    _instance->setSndBufSizeWarn(type, size);
+}
+
+void
+IceInternal::ProtocolInstance::setRcvBufSizeWarn(Short type, int size)
+{
+    _instance->setRcvBufSizeWarn(type, size);
+}
+
 bool
 IceInternal::ProtocolInstance::preferIPv6() const
 {
@@ -98,4 +134,3 @@ IceInternal::ProtocolInstance::resolve(const string& host, int port, EndpointSel
 {
     _instance->endpointHostResolver()->resolve(host, port, type, endpt, cb);
 }
-