diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-07-24 16:06:51 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-07-24 16:06:51 +0000 |
| commit | ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c (patch) | |
| tree | 3af419df5b8c46c809d579fdcd7165135f452d8f /cpp/src/slice2cpp | |
| parent | VS 2010 build fix (diff) | |
| download | ice-ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c.tar.bz2 ice-ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c.tar.xz ice-ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c.zip | |
Completed fix for ICE-5567: move various C++11 classes/functions out of line
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 91397221f03..4c1dcbed7da 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2294,7 +2294,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) } writeEndCode(C, outParams, p); C << eb; - C << nl << "catch(::Ice::Exception& ex)"; + C << nl << "catch(const ::Ice::Exception& ex)"; C << sb; C << nl << "Cpp11FnCallbackNC::__exception(__result, ex);"; C << nl << "return;"; @@ -4325,7 +4325,7 @@ Slice::Gen::AsyncCallbackTemplateVisitor::generateOperation(const OperationPtr& } writeEndCode(H, outParams, p); H << eb; - H << nl << "catch(::Ice::Exception& ex)"; + H << nl << "catch(const ::Ice::Exception& ex)"; H << sb; H << nl << "" << baseD << "::__exception(__result, ex);"; |