diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-04-24 09:29:00 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2019-04-24 09:29:00 -0400 |
| commit | 24645b52c96afce904232e5a233dff149d8745e9 (patch) | |
| tree | 91c737dca0baea207c004e58ccd1581c114e721d /cpp/src | |
| parent | Fixed copyright notice (diff) | |
| download | ice-24645b52c96afce904232e5a233dff149d8745e9.tar.bz2 ice-24645b52c96afce904232e5a233dff149d8745e9.tar.xz ice-24645b52c96afce904232e5a233dff149d8745e9.zip | |
Fixed keyword escaping
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2swift/Gen.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2swift/SwiftUtil.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp index d695032147c..29891997277 100644 --- a/cpp/src/slice2swift/Gen.cpp +++ b/cpp/src/slice2swift/Gen.cpp @@ -498,7 +498,7 @@ bool Gen::TypesVisitor::visitStructStart(const StructPtr& p) { const string swiftModule = getSwiftModule(getTopLevelModule(ContainedPtr::dynamicCast(p))); - const string name = getUnqualified(getAbsolute(p), swiftModule); + const string name = fixIdent(getUnqualified(getAbsolute(p), swiftModule)); bool containsSequence; bool legalKeyType = Dictionary::legalKeyType(p, containsSequence); const DataMemberList members = p->dataMembers(); diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp index c947f02dcf5..9b1ca4bc06a 100644 --- a/cpp/src/slice2swift/SwiftUtil.cpp +++ b/cpp/src/slice2swift/SwiftUtil.cpp @@ -245,7 +245,7 @@ getAbsoluteImpl(const ContainedPtr& cont, const string& prefix = "", const strin { str = str.substr(pos + 2); } - return swiftModule + "." + fixIdent(swiftPrefix + replace(str, "::", "")); + return swiftModule + "." + swiftPrefix + replace(str, "::", ""); } } |