summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2015-12-18 14:05:33 +0100
committerJose <jose@zeroc.com>2015-12-18 14:05:33 +0100
commit9ae75237e0784fd302d94b5dd2ec34e42d2c3681 (patch)
tree7e0a96821ce32d734ce3cf39e1d9f8ab5435bbd1 /cpp/src
parentDisable running C++11 travis tests (diff)
downloadice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.tar.bz2
ice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.tar.xz
ice-9ae75237e0784fd302d94b5dd2ec34e42d2c3681.zip
C++11 background & metrics test fixes
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/LocatorInfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index 68db941c94b..9516548a5be 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -59,7 +59,7 @@ public:
{
rethrow_exception(e);
}
- catch(const UserException& ex)
+ catch(const Exception& ex)
{
request->exception(ex);
}
@@ -105,7 +105,7 @@ public:
{
rethrow_exception(e);
}
- catch(const UserException& ex)
+ catch(const Exception& ex)
{
request->exception(ex);
}