diff options
Diffstat (limited to 'cpp/src/slice2java/Gen.h')
| -rw-r--r-- | cpp/src/slice2java/Gen.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h index 001bca3c89e..e8b12e3743b 100644 --- a/cpp/src/slice2java/Gen.h +++ b/cpp/src/slice2java/Gen.h @@ -7,8 +7,7 @@ // // ********************************************************************** -#ifndef GEN_H -#define GEN_H +#pragma once #include <Slice/Parser.h> #include <Slice/JavaUtil.h> @@ -33,9 +32,10 @@ protected: // Compose the parameter lists for an operation. // std::vector<std::string> getParams(const OperationPtr&, const std::string&, bool = false); - std::vector<std::string> getInOutParams(const OperationPtr&, const std::string&, ParamDir); + 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. @@ -46,7 +46,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. @@ -289,12 +289,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. @@ -335,5 +336,3 @@ private: }; } - -#endif |