diff options
| author | Mark Spruiell <mes@zeroc.com> | 2012-08-01 15:40:11 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2012-08-01 15:40:11 -0700 |
| commit | 0bb93b9fac3f6a198798cfcd86b79121f76598fc (patch) | |
| tree | e07b8224a70052c42c79edf2c69290f0a15c1c1a /cpp/include | |
| parent | updating Java API (diff) | |
| download | ice-0bb93b9fac3f6a198798cfcd86b79121f76598fc.tar.bz2 ice-0bb93b9fac3f6a198798cfcd86b79121f76598fc.tar.xz ice-0bb93b9fac3f6a198798cfcd86b79121f76598fc.zip | |
more Java changes & tests
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Slice/JavaUtil.h | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h index 7fc742b2ac3..c8bb6a71f85 100644 --- a/cpp/include/Slice/JavaUtil.h +++ b/cpp/include/Slice/JavaUtil.h @@ -118,9 +118,9 @@ protected: std::string getStaticId(const TypePtr&, const std::string&) const; // - // Determines whether an in parameter should use the optional mapping. + // Determines whether an operation should use the optional mapping. // - bool useOptionalMapping(const ParamDeclPtr&); + bool useOptionalMapping(const OperationPtr&); // // Returns the optional type corresponding to the given Slice type. @@ -155,22 +155,15 @@ protected: enum OptionalMode { OptionalNone, - OptionalInParamReq, // Use the required mapping. - OptionalInParamOpt, // Use the optional mapping. + OptionalInParam, OptionalOutParam, OptionalReturnParam, OptionalMember }; - bool isOptionalParam(OptionalMode mode) const - { - return mode == OptionalInParamReq || mode == OptionalInParamOpt || mode == OptionalOutParam || - mode == OptionalReturnParam; - } - - void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, OptionalMode, int, - const std::string&, bool, int&, bool = false, const StringList& = StringList(), - const std::string& patchParams = ""); + void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, OptionalMode, + bool, int, const std::string&, bool, int&, bool = false, + const StringList& = StringList(), const std::string& patchParams = ""); // // Generate code to marshal or unmarshal a dictionary type. @@ -188,8 +181,8 @@ protected: // // Generate code to marshal or unmarshal a type using the public stream API. // - void writeStreamMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, OptionalMode, - int, const std::string&, bool, int&, bool = false, + void writeStreamMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, bool, int, + const std::string&, bool, int&, bool = false, const StringList& = StringList(), const std::string& patchParams = ""); // |