From a7b39fcf26f3335fbf6f4ba65534c1d82c4bcd24 Mon Sep 17 00:00:00 2001 From: Michi Henning Date: Wed, 28 Jan 2009 08:06:14 +1000 Subject: Squashed commit of the following: commit e2472df68af6933320425f6ef65f7234e988e77c Author: michi Date: Wed Jan 28 08:05:19 2009 +1000 Bug 3677. Follow-up fix that fixes bad code in C++ if a class whose name is a keyword contains data members. Also fixed same problem with slice2java. Added test case for all language mappings. --- cpp/src/slice2cpp/Gen.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/src/slice2cpp/Gen.cpp') diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 22a033421c6..f990ccdf38a 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -4460,7 +4460,8 @@ Slice::Gen::ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p) if(!allDataMembers.empty()) { - C << sp << nl << p->scoped().substr(2) << "::" << fixKwd(p->name()) << spar << allParamDecls << epar << " :"; + C << sp << nl << fixKwd(p->scoped()).substr(2) << "::" << fixKwd(p->name()) + << spar << allParamDecls << epar << " :"; C.inc(); DataMemberList dataMembers = p->dataMembers(); -- cgit v1.2.3