diff options
| author | Benjamin Oldenburg <benjamin.oldenburg@ordis.co.th> | 2022-03-29 22:44:41 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-29 11:44:41 -0400 |
| commit | bd2774e47003b83ba6791ed4603a57282a37b3dd (patch) | |
| tree | 27c9d8e0a4f4f4d96ad3ce04696297b69ca48e0c /cpp/src | |
| parent | Fix issue with Clang 13 (#1353) (diff) | |
| download | ice-bd2774e47003b83ba6791ed4603a57282a37b3dd.tar.bz2 ice-bd2774e47003b83ba6791ed4603a57282a37b3dd.tar.xz ice-bd2774e47003b83ba6791ed4603a57282a37b3dd.zip | |
Clang 13 complains about an unused variable (#1354)
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2swift/Gen.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/slice2swift/SwiftUtil.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/slice2swift/SwiftUtil.h | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/cpp/src/slice2swift/Gen.cpp b/cpp/src/slice2swift/Gen.cpp index 233f017edd3..0a7f28c6169 100644 --- a/cpp/src/slice2swift/Gen.cpp +++ b/cpp/src/slice2swift/Gen.cpp @@ -466,7 +466,7 @@ Gen::TypesVisitor::visitExceptionStart(const ExceptionPtr& p) { writeDefaultInitializer(out, true, rootClass); } - writeMemberwiseInitializer(out, members, baseMembers, allMembers, p, p->isLocal(), rootClass, extraParams); + writeMemberwiseInitializer(out, members, baseMembers, allMembers, p, rootClass, extraParams); out << sp; out << nl << "/// Returns the Slice type ID of this exception."; @@ -1455,7 +1455,7 @@ Gen::ValueVisitor::visitClassDefStart(const ClassDefPtr& p) { writeDefaultInitializer(out, true, !base); } - writeMemberwiseInitializer(out, members, baseMembers, allMembers, p, p->isLocal(), !base); + writeMemberwiseInitializer(out, members, baseMembers, allMembers, p, !base); out << sp; out << nl << "/// Returns the Slice type ID of the most-derived interface supported by this object."; diff --git a/cpp/src/slice2swift/SwiftUtil.cpp b/cpp/src/slice2swift/SwiftUtil.cpp index 404dee76704..583b37a8671 100644 --- a/cpp/src/slice2swift/SwiftUtil.cpp +++ b/cpp/src/slice2swift/SwiftUtil.cpp @@ -1514,7 +1514,7 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, const DataMemberList& members, const ContainedPtr& p) { - writeMemberwiseInitializer(out, members, DataMemberList(), members, p, false, true); + writeMemberwiseInitializer(out, members, DataMemberList(), members, p, true); } void @@ -1523,7 +1523,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, const DataMemberList& baseMembers, const DataMemberList& allMembers, const ContainedPtr& p, - bool local, bool rootClass, const StringPairList& extraParams) { @@ -1531,11 +1530,6 @@ SwiftGenerator::writeMemberwiseInitializer(IceUtilInternal::Output& out, { out << sp; out << nl; - int typeCtx = TypeContextInParam; - if(local) - { - typeCtx |= TypeContextLocal; - } out << "public init" << spar; for(DataMemberList::const_iterator i = allMembers.begin(); i != allMembers.end(); ++i) { diff --git a/cpp/src/slice2swift/SwiftUtil.h b/cpp/src/slice2swift/SwiftUtil.h index d52783a067f..bd5ab0c8cc6 100644 --- a/cpp/src/slice2swift/SwiftUtil.h +++ b/cpp/src/slice2swift/SwiftUtil.h @@ -119,7 +119,6 @@ protected: void writeMemberwiseInitializer(IceUtilInternal::Output&, const DataMemberList&, const ContainedPtr&); void writeMemberwiseInitializer(IceUtilInternal::Output&, const DataMemberList&, const DataMemberList&, const DataMemberList&, const ContainedPtr&, - bool local = false, bool rootClass = false, const StringPairList& = StringPairList()); void writeMembers(IceUtilInternal::Output&, const DataMemberList&, const ContainedPtr&, int = 0); |