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/slice2js/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/slice2js/Gen.h')
| -rw-r--r-- | cpp/src/slice2js/Gen.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/slice2js/Gen.h b/cpp/src/slice2js/Gen.h index 86011de4bc8..8b788ae334b 100644 --- a/cpp/src/slice2js/Gen.h +++ b/cpp/src/slice2js/Gen.h @@ -26,10 +26,10 @@ protected: void writeMarshalUnmarshalParams(const ParamDeclList&, const OperationPtr&, bool); void writePostUnmarshalParams(const ParamDeclList&, const OperationPtr&); - void writeMarshalDataMember(const DataMemberPtr&); - void writeUnmarshalDataMember(const DataMemberPtr&); + void writeMarshalDataMembers(const DataMemberList&); + void writeUnmarshalDataMembers(const DataMemberList&); + void writeInitDataMembers(const DataMemberList&, const std::string&); - virtual void writeDispatchAndMarshalling(const ClassDefPtr&); virtual std::vector<std::string> getParams(const OperationPtr&); virtual std::vector<std::string> getParamsAsync(const OperationPtr&, bool, bool = false); virtual std::vector<std::string> getParamsAsyncCB(const OperationPtr&, bool = false, bool = true); @@ -40,7 +40,7 @@ protected: std::string getValue(const std::string&, const TypePtr&); void writeConstantValue(const std::string&, const TypePtr&, const SyntaxTreeBasePtr&, const std::string&); - + static StringList splitComment(const ContainedPtr&); void writeDocComment(const ContainedPtr&, const std::string&, const std::string& = ""); @@ -55,7 +55,7 @@ public: const std::vector<std::string>&, const std::string&, bool); - + Gen(const std::string&, const std::vector<std::string>&, const std::string&, @@ -75,7 +75,7 @@ private: std::string _fileBase; bool _icejs; bool _useStdout; - + void printHeader(); class RequireVisitor : public JsVisitor @@ -132,7 +132,7 @@ private: std::vector<std::string> _seenModules; bool _icejs; }; - + class ExportVisitor : public JsVisitor { public: |