diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp index 46acfc94811..8e7ad4c264d 100644 --- a/cpp/src/Slice/JavaUtil.cpp +++ b/cpp/src/Slice/JavaUtil.cpp @@ -174,7 +174,7 @@ lookupKwd(const string& name) name); return found ? "_" + name : name; } -// + // // Split a scoped name into its components and return the components as a list of (unscoped) identifiers. // diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 3b0de1f5437..e8a6e5e2430 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -95,9 +95,9 @@ Slice::JavaVisitor::getParamsAsync(const OperationPtr& op, const string& scope, ContainerPtr container = op->container(); ClassDefPtr cl = ClassDefPtr::dynamicCast(container); - string classNameAsync = (amd ? "AMD_" : "AMI_") + fixKwd(cl->name()); + string classNameAsync = getAbsolute(cl->scoped(), scope, amd ? "AMD_" : "AMI_", '_' + name); - string params = classNameAsync + '_' + name + " __cb"; + string params = classNameAsync + " __cb"; ParamDeclList paramList = op->parameters(); for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q) { |