diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-17 13:37:27 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-17 13:37:27 -0500 |
| commit | 9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab (patch) | |
| tree | d766a020835106766c07cf12f11a309764969c20 /cpp/src/Slice/JavaUtil.h | |
| parent | ICE-7417 - Rename data directory (diff) | |
| download | ice-9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab.tar.bz2 ice-9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab.tar.xz ice-9fe9ffb11554bcbb6f4a32bcae70d9ffbb3b40ab.zip | |
Replaced double-underscores in java and java-compat
Diffstat (limited to 'cpp/src/Slice/JavaUtil.h')
| -rw-r--r-- | cpp/src/Slice/JavaUtil.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/cpp/src/Slice/JavaUtil.h b/cpp/src/Slice/JavaUtil.h index d9375be077e..fcc77d30f63 100644 --- a/cpp/src/Slice/JavaUtil.h +++ b/cpp/src/Slice/JavaUtil.h @@ -168,21 +168,22 @@ protected: }; void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, OptionalMode, - bool, int, const std::string&, bool, int&, bool = false, - const StringList& = StringList(), const std::string& patchParams = ""); + bool, int, const std::string&, bool, int&, bool = false, const std::string& = "", + const StringList& = StringList(), const std::string& = ""); // // Generate code to marshal or unmarshal a dictionary type. // void writeDictionaryMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const DictionaryPtr&, - const std::string&, bool, int&, bool, - const StringList& = StringList()); + const std::string&, bool, int&, bool, + const std::string& = "", const StringList& = StringList()); // // Generate code to marshal or unmarshal a sequence type. // void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const SequencePtr&, - const std::string&, bool, int&, bool, const StringList& = StringList()); + const std::string&, bool, int&, bool, + const std::string& = "", const StringList& = StringList()); // // Search metadata for an entry with the given prefix and return the entire string. @@ -334,21 +335,22 @@ protected: }; void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const TypePtr&, OptionalMode, - bool, int, const std::string&, bool, int&, const StringList& = StringList(), - const std::string& patchParams = ""); + bool, int, const std::string&, bool, int&, const std::string& = "", + const StringList& = StringList(), const std::string& = ""); // // Generate code to marshal or unmarshal a dictionary type. // void writeDictionaryMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const DictionaryPtr&, const std::string&, bool, int&, bool, - const StringList& = StringList()); + const std::string& = "", const StringList& = StringList()); // // Generate code to marshal or unmarshal a sequence type. // void writeSequenceMarshalUnmarshalCode(::IceUtilInternal::Output&, const std::string&, const SequencePtr&, - const std::string&, bool, int&, bool, const StringList& = StringList()); + const std::string&, bool, int&, bool, + const std::string& = "", const StringList& = StringList()); // // Search metadata for an entry with the given prefix and return the entire string. |