diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-18 09:07:48 -0800 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-18 09:07:48 -0800 |
| commit | 115af5842f43c52a6f33d1a3e457aa36c88e2114 (patch) | |
| tree | 6afb1ef1d5a3d4e5de62d00cfb4832077e52379f /cpp/src | |
| parent | Merge branch 'master' of ssh://dev.vpn.zeroc.com/home/git/ice (diff) | |
| parent | Updated properties (diff) | |
| download | ice-115af5842f43c52a6f33d1a3e457aa36c88e2114.tar.bz2 ice-115af5842f43c52a6f33d1a3e457aa36c88e2114.tar.xz ice-115af5842f43c52a6f33d1a3e457aa36c88e2114.zip | |
Merge branch 'master' of ssh://dev.vpn.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 6fe0c633e4e..014228c8392 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 18 14:06:41 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 18 16:16:35 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -140,7 +140,7 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.TCP.Backlog", false, 0), IceInternal::Property("Ice.TCP.RcvSize", false, 0), IceInternal::Property("Ice.TCP.SndSize", false, 0), - IceInternal::Property("Ice.UseUserClassLoader", false, 0), + IceInternal::Property("Ice.UseApplicationClassLoader", false, 0), IceInternal::Property("Ice.UseSyslog", false, 0), IceInternal::Property("Ice.Warn.AMICallback", false, 0), IceInternal::Property("Ice.Warn.Connections", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 6567bae2c0c..49f179b6772 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 18 14:06:41 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jan 18 16:16:35 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |