summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/slicing/exceptions/AllTests.cpp4
-rw-r--r--cpp/test/Ice/slicing/objects/AllTests.cpp4
2 files changed, 4 insertions, 4 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);
diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp
index c67033d0887..b23a4253468 100644
--- a/cpp/test/Ice/slicing/objects/AllTests.cpp
+++ b/cpp/test/Ice/slicing/objects/AllTests.cpp
@@ -106,7 +106,7 @@ public:
void
exception_SBSUnknownDerivedAsSBaseCompact(const Ice::Exception& exc)
{
- test(exc.ice_name() == "Ice::MarshalException");
+ test(exc.ice_name() == "Ice::NoObjectFactoryException");
called();
}
@@ -715,7 +715,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
SBasePtr sb = test->SBSUnknownDerivedAsSBaseCompact();
test(false);
}
- catch(const Ice::MarshalException&)
+ catch(const Ice::NoObjectFactoryException&)
{
// Expected.
}