From d48f77a15aa2184d048b664d8d0287bfc430e0f8 Mon Sep 17 00:00:00 2001 From: Michi Henning Date: Mon, 19 May 2003 00:54:05 +0000 Subject: - 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. --- cpp/include/Slice/JavaUtil.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/include/Slice/JavaUtil.h') 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::list()); + bool, int&, bool = false, const std::list& = std::list(), + const std::string& patchParams = ""); // // Generate code to marshal or unmarshal a sequence type -- cgit v1.2.3