diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/faultTolerance/Test.ice | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index f5391d724d1..04abd723fbf 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -245,7 +245,7 @@ IceInternal::LocatorInfo::getEndpoints(const ReferencePtr& ref, bool& cached) endpoints = object->__reference()->endpoints; } } - catch(LocalException& ex) + catch(const LocalException&) { // // Ignore. The proxy will most likely get empty diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 9d3e232a34b..ec98cd7ef34 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -1778,7 +1778,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p) C << sb; C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__);"; C << eb; - C << nl << "catch (...)"; + C << nl << "catch(...)"; C << sb; C << nl << "throw ::Ice::UnknownException(__FILE__, __LINE__);"; C << eb; diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice index fbaa845ab40..0b62f9b1dc4 100644 --- a/cpp/test/Ice/faultTolerance/Test.ice +++ b/cpp/test/Ice/faultTolerance/Test.ice @@ -15,7 +15,7 @@ interface Test { void shutdown(); void abort(); - nonmutating void idempotentAbort(); + idempotent void idempotentAbort(); int pid(); }; |