diff options
| author | Michi Henning <michi@zeroc.com> | 2003-05-19 00:54:05 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2003-05-19 00:54:05 +0000 |
| commit | d48f77a15aa2184d048b664d8d0287bfc430e0f8 (patch) | |
| tree | bd51fe2f8a8d97a0bd3fa78788e154a89450a7cd /cpp/include/Slice/JavaUtil.h | |
| parent | Use %x to display the date (diff) | |
| download | ice-d48f77a15aa2184d048b664d8d0287bfc430e0f8.tar.bz2 ice-d48f77a15aa2184d048b664d8d0287bfc430e0f8.tar.xz ice-d48f77a15aa2184d048b664d8d0287bfc430e0f8.zip | |
- Fixed a bug in the code generator for dictionaries with class values.
- Added more support for Java slicing.
- Changed config/Make.rules: "make depend" was calling slice2cpp with
ICECPPFLAGS, not SLICE2CPPFLAGS. This meant that "make depend" was
invoking slice2cpp with options that were potentially different from
those passed for normal compilation of slice files, which could lead to
inconsistencies.
Diffstat (limited to 'cpp/include/Slice/JavaUtil.h')
| -rw-r--r-- | cpp/include/Slice/JavaUtil.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/include/Slice/JavaUtil.h b/cpp/include/Slice/JavaUtil.h index d3e5166fd62..ab7802cd647 100644 --- a/cpp/include/Slice/JavaUtil.h +++ b/cpp/include/Slice/JavaUtil.h @@ -74,7 +74,8 @@ protected: // Generate code to marshal or unmarshal a type // void writeMarshalUnmarshalCode(::IceUtil::Output&, const std::string&, const TypePtr&, const std::string&, - bool, int&, bool = false, const std::list<std::string>& = std::list<std::string>()); + bool, int&, bool = false, const std::list<std::string>& = std::list<std::string>(), + const std::string& patchParams = ""); // // Generate code to marshal or unmarshal a sequence type |