diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-10-29 18:38:58 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-29 18:38:58 +0100 |
commit | a3c39014e6b13f7a88562d1fc907400b1cf50e5a (patch) | |
tree | 0b9f80d70657f09f64e973048e1f43148e80b96d /cpp/test/Ice/slicing/exceptions/AllTests.cpp | |
parent | Fixed Glacier2 leak (diff) | |
download | ice-a3c39014e6b13f7a88562d1fc907400b1cf50e5a.tar.bz2 ice-a3c39014e6b13f7a88562d1fc907400b1cf50e5a.tar.xz ice-a3c39014e6b13f7a88562d1fc907400b1cf50e5a.zip |
Fixed tests failures and some demo scripts
Diffstat (limited to 'cpp/test/Ice/slicing/exceptions/AllTests.cpp')
-rw-r--r-- | cpp/test/Ice/slicing/exceptions/AllTests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/slicing/exceptions/AllTests.cpp b/cpp/test/Ice/slicing/exceptions/AllTests.cpp index 74ce31bba6c..0ea733dde2c 100644 --- a/cpp/test/Ice/slicing/exceptions/AllTests.cpp +++ b/cpp/test/Ice/slicing/exceptions/AllTests.cpp @@ -773,10 +773,10 @@ allTests(const Ice::CommunicatorPtr& communicator) // test(test->ice_getEncodingVersion() == Ice::Encoding_1_0); } - catch(const Ice::MarshalException&) + catch(const Ice::UnknownUserException&) { // - // A MarshalException is raised for the compact format because the + // An UnknownUserException is raised for the compact format because the // most-derived type is unknown and the exception cannot be sliced. // test(test->ice_getEncodingVersion() != Ice::Encoding_1_0); |