summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-11 15:48:03 +0100
committerJose <jose@zeroc.com>2016-01-11 15:48:03 +0100
commit822bea3ef1a6def960b2b68a90dd8697acff70fe (patch)
tree1309aff1d55b0b48d98ae19061f23881b3c80ab7
parentC++11 build fixes for gcc 4.8 on rhel7 (diff)
downloadice-822bea3ef1a6def960b2b68a90dd8697acff70fe.tar.bz2
ice-822bea3ef1a6def960b2b68a90dd8697acff70fe.tar.xz
ice-822bea3ef1a6def960b2b68a90dd8697acff70fe.zip
Fix Ice/location test failures with C++11
-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 a1c8623c382..ae3936fccb2 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -447,7 +447,7 @@ IceInternal::LocatorInfo::Request::addCallback(const ReferencePtr& ref,
{
rethrow_exception(_exception);
}
- catch(const Ice::LocalException& ex)
+ catch(const Ice::Exception& ex)
{
callback->exception(_locatorInfo, ex);
}
@@ -491,7 +491,7 @@ IceInternal::LocatorInfo::Request::getEndpoints(const ReferencePtr& ref,
{
rethrow_exception(_exception);
}
- catch(const Ice::LocalException& ex)
+ catch(const Ice::Exception& ex)
{
_locatorInfo->getEndpointsException(ref, ex); // This throws.
}