summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertyNames.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/PropertyNames.cpp')
-rw-r--r--cpp/src/Ice/PropertyNames.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 47e52f48a2f..73d11ee4f12 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Mon Sep 8 11:41:52 2014
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 9 11:19:09 2014
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -78,6 +78,7 @@ const IceInternal::Property IcePropsData[] =
IceInternal::Property("Ice.ChangeUser", false, 0),
IceInternal::Property("Ice.ClientAccessPolicyProtocol", false, 0),
IceInternal::Property("Ice.Compression.Level", false, 0),
+ IceInternal::Property("Ice.CollectObjects", false, 0),
IceInternal::Property("Ice.Config", false, 0),
IceInternal::Property("Ice.ConsoleListener", false, 0),
IceInternal::Property("Ice.Default.CollocationOptimized", false, 0),
@@ -112,13 +113,14 @@ const IceInternal::Property IcePropsData[] =
IceInternal::Property("Ice.Default.SlicedFormat", false, 0),
IceInternal::Property("Ice.Default.SourceAddress", false, 0),
IceInternal::Property("Ice.Default.Timeout", false, 0),
- IceInternal::Property("Ice.IPv4", false, 0),
- IceInternal::Property("Ice.IPv6", false, 0),
IceInternal::Property("Ice.EventLog.Source", false, 0),
IceInternal::Property("Ice.FactoryAssemblies", false, 0),
- IceInternal::Property("Ice.CollectObjects", false, 0),
+ IceInternal::Property("Ice.HTTPProxyHost", false, 0),
+ IceInternal::Property("Ice.HTTPProxyPort", false, 0),
IceInternal::Property("Ice.ImplicitContext", false, 0),
IceInternal::Property("Ice.InitPlugins", false, 0),
+ IceInternal::Property("Ice.IPv4", false, 0),
+ IceInternal::Property("Ice.IPv6", false, 0),
IceInternal::Property("Ice.LogFile", false, 0),
IceInternal::Property("Ice.LogStdErr.Convert", false, 0),
IceInternal::Property("Ice.MessageSizeMax", false, 0),