summaryrefslogtreecommitdiff
path: root/cpp/src/slice2objc/Gen.h
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-12-06 14:33:03 -0500
committerBernard Normier <bernard@zeroc.com>2016-12-06 14:33:03 -0500
commitd2cadef086b2a694bb33830caa1bec57fa42a3e4 (patch)
tree1f3a5a89626192f73b46e07e8176eb60f484035d /cpp/src/slice2objc/Gen.h
parentFixed for ICE-7458 - Removed escaping form double quoted strings of icegridad... (diff)
downloadice-d2cadef086b2a694bb33830caa1bec57fa42a3e4.tar.bz2
ice-d2cadef086b2a694bb33830caa1bec57fa42a3e4.tar.xz
ice-d2cadef086b2a694bb33830caa1bec57fa42a3e4.zip
Removed or replaced most double underscores in ObjC
Diffstat (limited to 'cpp/src/slice2objc/Gen.h')
-rw-r--r--cpp/src/slice2objc/Gen.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2objc/Gen.h b/cpp/src/slice2objc/Gen.h
index 75d86c78285..0c9ef639e7d 100644
--- a/cpp/src/slice2objc/Gen.h
+++ b/cpp/src/slice2objc/Gen.h
@@ -29,10 +29,10 @@ protected:
virtual void writeMarshalUnmarshalParams(const ParamDeclList&, const OperationPtr&, bool, bool = false);
virtual std::string getName(const OperationPtr&) const;
virtual std::string getSelector(const OperationPtr&) const;
- virtual std::string getParams(const OperationPtr&) const;
+ virtual std::string getParams(const OperationPtr&, bool = false) const;
virtual std::string getBlockParams(const OperationPtr&) const;
- virtual std::string getMarshalParams(const OperationPtr&) const;
- virtual std::string getUnmarshalParams(const OperationPtr&) const;
+ virtual std::string getMarshalParams(const OperationPtr&, bool = false) const;
+ virtual std::string getUnmarshalParams(const OperationPtr&, bool = false) const;
virtual std::string getServerParams(const OperationPtr&) const;
virtual std::string getResponseCBSig(const OperationPtr&) const;
virtual std::string getArgs(const OperationPtr&) const;
@@ -147,7 +147,7 @@ private:
void writeOptionalDataMemberSelectors(const DataMemberList&, int) const;
void writeMemberHashCode(const DataMemberList&, int) const;
void writeMemberEquals(const DataMemberList&, int) const;
- void writeMemberDealloc(const DataMemberList&, int, bool slicedData = false) const;
+ void writeMemberDealloc(const DataMemberList&, int, const std::string& = "") const;
void writeMemberMarshal(const DataMemberList&, const DataMemberList&, int) const;
void writeMemberUnmarshal(const DataMemberList&, const DataMemberList&, int) const;
};