summaryrefslogtreecommitdiff
path: root/cpp/src/slice2java/Gen.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-17 13:37:27 -0500
committerBernard Normier <bernard@zeroc.com>2016-11-17 13:37:27 -0500
commit9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab (patch)
treed766a020835106766c07cf12f11a309764969c20 /cpp/src/slice2java/Gen.h
parentICE-7417 - Rename data directory (diff)
downloadice-9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab.tar.bz2
ice-9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab.tar.xz
ice-9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab.zip
Replaced double-underscores in java and java-compat
Diffstat (limited to 'cpp/src/slice2java/Gen.h')
-rw-r--r--cpp/src/slice2java/Gen.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2java/Gen.h b/cpp/src/slice2java/Gen.h
index 102a71633f9..5e6046bcd85 100644
--- a/cpp/src/slice2java/Gen.h
+++ b/cpp/src/slice2java/Gen.h
@@ -56,7 +56,7 @@ protected:
// Compose the parameter lists for an operation.
//
std::vector<std::string> getParams(const OperationPtr&, const std::string&);
- std::vector<std::string> getParamsProxy(const OperationPtr&, const std::string&, bool);
+ std::vector<std::string> getParamsProxy(const OperationPtr&, const std::string&, bool, bool = false);
//
// Compose the argument lists for an operation.
@@ -83,8 +83,8 @@ protected:
//
// Marshal/unmarshal a data member.
//
- void writeMarshalDataMember(::IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, int&);
- void writeUnmarshalDataMember(::IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, int&);
+ void writeMarshalDataMember(::IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, int&, bool = false);
+ void writeUnmarshalDataMember(::IceUtilInternal::Output&, const std::string&, const DataMemberPtr&, int&, bool = false);
//
// Generate dispatch methods for a class or interface.