diff options
| author | Michi Henning <michi@zeroc.com> | 2004-09-07 03:58:49 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2004-09-07 03:58:49 +0000 |
| commit | 5c0f21c7fe9e334838b6ef8f905c4390033425a4 (patch) | |
| tree | 3d7f4820818b3daa59f1b1f961fc8872c94bd483 /cpp/src/slice2cpp | |
| parent | initial check-in (diff) | |
| download | ice-5c0f21c7fe9e334838b6ef8f905c4390033425a4.tar.bz2 ice-5c0f21c7fe9e334838b6ef8f905c4390033425a4.tar.xz ice-5c0f21c7fe9e334838b6ef8f905c4390033425a4.zip | |
Change made for r1.227 did not correctly deal with Slice identifiers that
are C++ keywords.
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 5d1e2a231c2..85710132ab1 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -1612,7 +1612,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i) { string scoped = (*i)->scoped(); - C << nl << "catch(const " << (*i)->scoped() << "&)"; + C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)"; C << sb; C << nl << "throw;"; C << eb; @@ -3578,7 +3578,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i) { string scoped = (*i)->scoped(); - C << nl << "catch(const " << (*i)->scoped() << "& __ex)"; + C << nl << "catch(const " << fixKwd((*i)->scoped()) << "& __ex)"; C << sb; C << nl << "ice_exception(__ex);"; C << nl << "return;"; |