diff options
| author | Michi Henning <michi@zeroc.com> | 2006-02-02 05:26:38 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2006-02-02 05:26:38 +0000 |
| commit | ec83ba5f51765338c06d86d41219417172899cc9 (patch) | |
| tree | fea26e781c1712554a5d72769a6c853dd55b8f56 /cpp/src | |
| parent | fix for CentOS waitpid bug (diff) | |
| download | ice-ec83ba5f51765338c06d86d41219417172899cc9.tar.bz2 ice-ec83ba5f51765338c06d86d41219417172899cc9.tar.xz ice-ec83ba5f51765338c06d86d41219417172899cc9.zip | |
Fixed bug in generated code for one-shot constructors.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 8b490f2a146..5d82de465e1 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -422,10 +422,9 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q) { - string paramName = fixKwd((*q)->name()); string typeName = inputTypeToString((*q)->type()); allTypes.push_back(typeName); - allParamDecls.push_back(typeName + " __ice_" + paramName); + allParamDecls.push_back(typeName + " __ice_" + (*q)->name()); } if(base) @@ -433,7 +432,7 @@ Slice::Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) DataMemberList baseDataMembers = base->allDataMembers(); for(q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q) { - baseParams.push_back("__ice_" + fixKwd((*q)->name())); + baseParams.push_back("__ice_" + (*q)->name()); } } @@ -2330,10 +2329,9 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) for(q = allDataMembers.begin(); q != allDataMembers.end(); ++q) { - string paramName = fixKwd((*q)->name()); string typeName = inputTypeToString((*q)->type()); allTypes.push_back(typeName); - allParamDecls.push_back(typeName + " __ice_" + paramName); + allParamDecls.push_back(typeName + " __ice_" + (*q)->name()); } if(!p->isInterface()) @@ -2406,7 +2404,7 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p) { upcall += ", "; } - upcall += fixKwd((*q)->name()); + upcall += "__ice_" + (*q)->name(); } upcall += ")"; } |