diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-08-28 16:50:05 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-08-28 16:50:05 -0700 |
| commit | 8a79fc65df39a451b39ae603d10a4e6001690cc5 (patch) | |
| tree | 5f5e1241112eac56eeb250b82a90512c114b5243 /cpp/include/Slice/CsUtil.h | |
| parent | Removed --encoding option added earlier today (diff) | |
| parent | initial support for optional params in C# (diff) | |
| download | ice-8a79fc65df39a451b39ae603d10a4e6001690cc5.tar.bz2 ice-8a79fc65df39a451b39ae603d10a4e6001690cc5.tar.xz ice-8a79fc65df39a451b39ae603d10a4e6001690cc5.zip | |
Merge branch 'csopt' into encoding11
Diffstat (limited to 'cpp/include/Slice/CsUtil.h')
| -rw-r--r-- | cpp/include/Slice/CsUtil.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/cpp/include/Slice/CsUtil.h b/cpp/include/Slice/CsUtil.h index 39b8ac9bbae..9cc8360cb38 100644 --- a/cpp/include/Slice/CsUtil.h +++ b/cpp/include/Slice/CsUtil.h @@ -34,16 +34,22 @@ public: protected: static std::string fixId(const std::string&, int = 0, bool = false); static std::string fixId(const ContainedPtr&, int = 0, bool = false); - static std::string typeToString(const TypePtr&); + static std::string getOptionalType(const TypePtr&); + static std::string getStaticId(const TypePtr&); + static std::string typeToString(const TypePtr&, bool = false); static bool isValueType(const TypePtr&); // // Generate code to marshal or unmarshal a type // void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool, bool, - bool, const std::string& = "", bool = false); + const std::string& = ""); + void writeOptionalMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, int, bool, + bool, const std::string& = ""); void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const SequencePtr&, const std::string&, - bool, bool); + bool, bool, bool); + void writeOptionalSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const SequencePtr&, const std::string&, + int, bool, bool); private: |