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/src/slice2java/Gen.h | |
| 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/src/slice2java/Gen.h')
| -rw-r--r-- | cpp/src/slice2java/Gen.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index 5cfeae3714a..94f0dc95a2d 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -32,11 +32,11 @@ protected: // // Compose the parameter lists for an operation. // - std::vector<std::string> getParams(const OperationPtr&, const std::string&); + std::vector<std::string> getParams(const OperationPtr&, const std::string&, bool = false); std::vector<std::string> getParamsProxy(const OperationPtr&, const std::string&, bool = false); std::vector<std::string> getInOutParams(const OperationPtr&, const std::string&, ParamDir, bool); std::vector<std::string> getParamsAsync(const OperationPtr&, const std::string&, bool); - std::vector<std::string> getParamsAsyncCB(const OperationPtr&, const std::string&); + std::vector<std::string> getParamsAsyncCB(const OperationPtr&, const std::string&, bool); // // Compose the argument lists for an operation. @@ -47,7 +47,7 @@ protected: std::vector<std::string> getArgsAsyncCB(const OperationPtr&); void writeMarshalUnmarshalParams(::IceUtilInternal::Output&, const std::string&, const ParamDeclList&, - const OperationPtr&, int&, bool, bool = false); + const OperationPtr&, int&, bool, bool, bool = false); // // Generate a throws clause containing only non-local exceptions. @@ -290,12 +290,13 @@ private: // Generate code to emit a local variable declaration and initialize it // if necessary. // - void writeDecl(::IceUtilInternal::Output&, const std::string&, const std::string&, const TypePtr&, const StringList&); + void writeDecl(::IceUtilInternal::Output&, const std::string&, const std::string&, const TypePtr&, + const StringList&, bool); // // Generate code to return a value. // - void writeReturn(::IceUtilInternal::Output&, const TypePtr&); + void writeReturn(::IceUtilInternal::Output&, const TypePtr&, bool); // // Generate an operation. |