diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2014-08-13 17:08:16 -0230 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2014-08-13 17:08:16 -0230 |
| commit | f91316d2843031b94a9d2ea3f69eca65ff3bbefa (patch) | |
| tree | 5de57fd88fd20ec6be44fef6a6a184f7216dd568 /cpp | |
| parent | ICE-5577 - remove JS generated files from GIT (diff) | |
| download | ice-f91316d2843031b94a9d2ea3f69eca65ff3bbefa.tar.bz2 ice-f91316d2843031b94a9d2ea3f69eca65ff3bbefa.tar.xz ice-f91316d2843031b94a9d2ea3f69eca65ff3bbefa.zip | |
- Added back the Ice.BackgroundIO property.
- Fixed some bugs in the interrupt test.
- Fixed a bug in Outgoing where the interrupt exception could be
swallowed.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 15d61a08bdf..7c11a5db27b 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, Wed Aug 13 09:11:52 2014 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Aug 13 15:11:58 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -177,6 +177,7 @@ const IceInternal::Property IcePropsData[] = IceInternal::Property("Ice.Warn.UnknownProperties", false, 0), IceInternal::Property("Ice.Warn.UnusedProperties", false, 0), IceInternal::Property("Ice.CacheMessageBuffers", false, 0), + IceInternal::Property("Ice.BackgroundIO", false, 0), }; const IceInternal::PropertyArray diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 056730eb3cf..d5b33df89b8 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ../config/PropertyNames.xml, Wed Aug 13 09:11:52 2014 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Aug 13 15:11:58 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |