summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java/Gen.h
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2012-11-26 09:27:49 -0800
committerMark Spruiell <mes@zeroc.com>2012-11-26 09:27:49 -0800
commit876ce1ea2b00c55085ee8d8c782a4f8bd3c42492 (patch)
treecdc69a348876864552181b7a8aaa324524317b7a /cpp/src/slice2java/Gen.h
parentFixed android supported version to >= 2.3 (diff)
downloadice-876ce1ea2b00c55085ee8d8c782a4f8bd3c42492.tar.bz2
ice-876ce1ea2b00c55085ee8d8c782a4f8bd3c42492.tar.xz
ice-876ce1ea2b00c55085ee8d8c782a4f8bd3c42492.zip
ICE-4794 - add overloads for optional Java mapping
Diffstat (limited to 'cpp/src/slice2java/Gen.h')
-rw-r--r--cpp/src/slice2java/Gen.h20
1 files changed, 15 insertions, 5 deletions
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 94f0dc95a2d..74b18ac623e 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&, 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&, bool);
+ std::vector<std::string> getParams(const OperationPtr&, const std::string&, bool, bool);
+ std::vector<std::string> getParamsProxy(const OperationPtr&, const std::string&, bool, bool);
+ std::vector<std::string> getInOutParams(const OperationPtr&, const std::string&, ParamDir, bool, bool);
+ std::vector<std::string> getParamsAsync(const OperationPtr&, const std::string&, bool, bool);
+ std::vector<std::string> getParamsAsyncCB(const OperationPtr&, const std::string&, bool, bool);
//
// Compose the argument lists for an operation.
@@ -224,6 +224,8 @@ private:
private:
+ void writeOperation(const ClassDefPtr&, const std::string&, const OperationPtr&, bool);
+
bool _stream;
};
@@ -254,6 +256,10 @@ private:
DelegateMVisitor(const std::string&);
virtual bool visitClassDefStart(const ClassDefPtr&);
+
+ private:
+
+ void writeOperation(const ClassDefPtr&, const std::string&, const OperationPtr&, bool);
};
class DelegateDVisitor : public JavaVisitor
@@ -263,6 +269,10 @@ private:
DelegateDVisitor(const std::string&);
virtual bool visitClassDefStart(const ClassDefPtr&);
+
+ private:
+
+ void writeOperation(const ClassDefPtr&, const std::string&, const OperationPtr&, bool);
};
class DispatcherVisitor : public JavaVisitor