summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-08-12 14:00:27 +0000
committerMarc Laukien <marc@zeroc.com>2001-08-12 14:00:27 +0000
commit1d20ed6fc8d49eec1a0a27a59cfabb99909b8a65 (patch)
tree38a980b5b197c3121f3b24417eeedb6de03e3164 /cpp/src
parentfix (diff)
downloadice-1d20ed6fc8d49eec1a0a27a59cfabb99909b8a65.tar.bz2
ice-1d20ed6fc8d49eec1a0a27a59cfabb99909b8a65.tar.xz
ice-1d20ed6fc8d49eec1a0a27a59cfabb99909b8a65.zip
location forward
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/slice2cpp/Gen.cpp4
-rw-r--r--cpp/src/slice2docbook/Gen.cpp4
2 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 161714d44a3..3e33c7f90f1 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -702,6 +702,10 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
C << nl << "return;";
}
C << eb;
+ C << nl << "catch (const ::Ice::LocationForward& __ex)";
+ C << sb;
+ C << nl << "__locationForward(__ex);";
+ C << eb;
C << nl << "catch (const ::IceInternal::NonRepeatable& __ex)";
C << sb;
if (p->nonmutating())
diff --git a/cpp/src/slice2docbook/Gen.cpp b/cpp/src/slice2docbook/Gen.cpp
index 1cc4be16248..b7bfed1296f 100644
--- a/cpp/src/slice2docbook/Gen.cpp
+++ b/cpp/src/slice2docbook/Gen.cpp
@@ -412,6 +412,7 @@ Slice::Gen::visitClassDefStart(const ClassDefPtr& p)
{
for (OperationList::iterator q = operations.begin(); q != operations.end(); ++q)
{
+ bool nonmutating = (*q)->nonmutating();
TypePtr returnType = (*q)->returnType();
TypeStringList inputParams = (*q)->inputParameters();
TypeStringList outputParams = (*q)->outputParameters();
@@ -420,7 +421,8 @@ Slice::Gen::visitClassDefStart(const ClassDefPtr& p)
start("section id=" + scopedToId((*q)->scoped()), (*q)->name());
O.zeroIndent();
- O << nl << "<synopsis>" << (returnType ? toString(returnType, p) : "<type>void</type>")
+ O << nl << "<synopsis>" << (nonmutating ? "nonmutating " : "")
+ << (returnType ? toString(returnType, p) : "<type>void</type>")
<< " <function>" << (*q)->name() << "</function>(";
O.inc();
TypeStringList::iterator r = inputParams.begin();