summaryrefslogtreecommitdiff
path: root/cpp/src/slice2cs/Gen.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-12-18 14:48:29 -0500
committerJoe George <joe@zeroc.com>2015-12-18 14:48:29 -0500
commit3c07e69ea17223c7d5a8449ec9bb75d9bba40e07 (patch)
tree6101376459c3f62f9fe4dcbb7819729667209191 /cpp/src/slice2cs/Gen.cpp
parentC++11 Ice/ami test hangs on OS X (diff)
downloadice-3c07e69ea17223c7d5a8449ec9bb75d9bba40e07.tar.bz2
ice-3c07e69ea17223c7d5a8449ec9bb75d9bba40e07.tar.xz
ice-3c07e69ea17223c7d5a8449ec9bb75d9bba40e07.zip
ICE-6903 - "async" metadata changes
- Rename "async" metadata to "async-oneway" - Update C++11 mapping for "async-oneway".
Diffstat (limited to 'cpp/src/slice2cs/Gen.cpp')
-rw-r--r--cpp/src/slice2cs/Gen.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index e5288b6d1e7..2b6e736795f 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -3352,7 +3352,7 @@ Slice::Gen::TypesVisitor::visitOperation(const OperationPtr& p)
<< spar << params << "Ice.Current current__" << epar << ';';
}
- if(isLocal && (classDef->hasMetaData("async") || p->hasMetaData("async")))
+ if(isLocal && (classDef->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")))
{
vector<string> paramsNewAsync = getParamsAsync(p, false);
@@ -5063,9 +5063,9 @@ Slice::Gen::AsyncDelegateVisitor::visitOperation(const OperationPtr& p)
ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
//
- // We also generate delegates for local twoway-style operations marked with "async" metadata.
+ // We also generate delegates for local twoway-style operations marked with "async-oneway" metadata.
//
- if(cl->isLocal() && (!(cl->hasMetaData("async") || p->hasMetaData("async")) || !p->returnsData()))
+ if(cl->isLocal() && (!(cl->hasMetaData("async-oneway") || p->hasMetaData("async-oneway")) || !p->returnsData()))
{
return;
}