diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-06-05 20:49:26 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-05 20:49:26 +0200 |
commit | be5f41f8ffd74f2651b1db1a61badfd41f17a36d (patch) | |
tree | b94687eaeb0f0024be247ef07efe7541b7d813b2 /cpp/src/Ice/PropertyNames.cpp | |
parent | Fixed ICE-5490: selector doesn't check for EPOLLERR on Linux (diff) | |
download | ice-be5f41f8ffd74f2651b1db1a61badfd41f17a36d.tar.bz2 ice-be5f41f8ffd74f2651b1db1a61badfd41f17a36d.tar.xz ice-be5f41f8ffd74f2651b1db1a61badfd41f17a36d.zip |
Fixed ICE-5499, new garbage collection support
Diffstat (limited to 'cpp/src/Ice/PropertyNames.cpp')
-rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 08a3b91b89f..c9bc11dc890 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 May 12 17:32:39 2014 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jun 4 19:01:29 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -109,7 +109,8 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.IPv6", false, 0), IceInternal::Property("Ice.EventLog.Source", false, 0), IceInternal::Property("Ice.FactoryAssemblies", false, 0), - IceInternal::Property("Ice.GC.Interval", false, 0), + IceInternal::Property("Ice.GC", false, 0), + IceInternal::Property("Ice.GC.Interval", true, "Ice.GC"), IceInternal::Property("Ice.ImplicitContext", false, 0), IceInternal::Property("Ice.InitPlugins", false, 0), IceInternal::Property("Ice.LogFile", false, 0), @@ -154,7 +155,7 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.ThreadPool.Server.ThreadPriority", false, 0), IceInternal::Property("Ice.ThreadPriority", false, 0), IceInternal::Property("Ice.Trace.Admin.Properties", false, 0), - IceInternal::Property("Ice.Trace.GC", false, 0), + IceInternal::Property("Ice.Trace.GC", true, 0), IceInternal::Property("Ice.Trace.Locator", false, 0), IceInternal::Property("Ice.Trace.Network", false, 0), IceInternal::Property("Ice.Trace.Protocol", false, 0), |