diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-02-20 14:27:41 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-02-20 14:27:41 +0100 |
| commit | af1544e7b81e8708c5fdee05a59328558a3030fe (patch) | |
| tree | 0933eb39159b8cf714aab7fe5901d0515674d7c6 /cpp/src/slice2objc/Gen.h | |
| parent | Simplification to Atomic usage (diff) | |
| download | ice-af1544e7b81e8708c5fdee05a59328558a3030fe.tar.bz2 ice-af1544e7b81e8708c5fdee05a59328558a3030fe.tar.xz ice-af1544e7b81e8708c5fdee05a59328558a3030fe.zip | |
Fix for ICE-6268, initialize enum, string and structs in Java/C#/Objective-C/JavaScript
Diffstat (limited to 'cpp/src/slice2objc/Gen.h')
| -rw-r--r-- | cpp/src/slice2objc/Gen.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h index 4cff82707d5..70a42ad37f7 100644 --- a/cpp/src/slice2objc/Gen.h +++ b/cpp/src/slice2objc/Gen.h @@ -131,17 +131,18 @@ private: enum ContainerType { LocalException, Other }; void writeConstantValue(IceUtilInternal::Output&, const TypePtr&, const std::string&) const; - void writeInit(const ContainedPtr&, const DataMemberList&, const DataMemberList&, const DataMemberList&, bool, + void writeInit(const ContainedPtr&, const DataMemberList&, const DataMemberList&, const DataMemberList&, bool, int, ContainerType) const; void writeFactory(const ContainedPtr&, const DataMemberList&, int, ContainerType) const; void writeCopyWithZone(const ContainedPtr&, const DataMemberList&, int, ContainerType) const; void writeMembers(const DataMemberList&, int) const; void writeMemberSignature(const DataMemberList&, int, ContainerType) const; void writeMemberCall(const DataMemberList&, int, ContainerType, Escape) const; + bool requiresMemberInit(const DataMemberList&) const; void writeMemberDefaultValueInit(const DataMemberList&, int) const; void writeMemberInit(const DataMemberList&, int) const; void writeProperties(const DataMemberList&, int) const; - void writeSynthesize(const DataMemberList&, int) const; + void writeSynthesize(const DataMemberList&, int) const; void writeOptionalDataMemberSelectors(const DataMemberList&, int) const; void writeMemberHashCode(const DataMemberList&, int) const; void writeMemberEquals(const DataMemberList&, int) const; |