1 files changed, 23 insertions, 11 deletions
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 0f121bcda98..5298a29c9be 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -27,29 +27,41 @@ SLICE_API void printHeader(::IceUtilInternal::Output&);
 SLICE_API void printVersionCheck(::IceUtilInternal::Output&);
 SLICE_API void printDllExportStuff(::IceUtilInternal::Output&, const std::string&);
 
-SLICE_API std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), bool = true);
-SLICE_API std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList());
-SLICE_API std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList());
-SLICE_API std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList());
+const int TypeContextInParam = 1;
+const int TypeContextAMIEnd = 2;
+const int TypeContextAMIPrivateEnd = 4;
+const int TypeContextAMICallPrivateEnd = 8;
+
+const int TypeContextUseWstring = 16;
+
+SLICE_API std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0);
+SLICE_API std::string returnTypeToString(const TypePtr&, const StringList& = StringList(), int = 0);
+SLICE_API std::string inputTypeToString(const TypePtr&, const StringList& = StringList(), int = 0);
+SLICE_API std::string outputTypeToString(const TypePtr&, const StringList& = StringList(), int = 0);
 SLICE_API std::string operationModeToString(Operation::Mode);
 
 SLICE_API std::string fixKwd(const std::string&);
 
 SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool,
                                          const std::string& = "", bool = true, const StringList& = StringList(),
-                                         bool = false);
+                                         int = 0);
                                              
 SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&, 
-                                const StringList&, bool = false);
+                                const StringList&, int = 0);
 SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
-                                  const StringList&, bool = false);
+                                  const StringList&, int = 0);
 
 SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&,
-                                 const StringList&, bool = false, bool = false);
+                                 const StringList&, int = 0);
+
 SLICE_API void writeStreamMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, const std::string&, bool,
-                                               const std::string& = "", bool = false, const StringList& = StringList());
-SLICE_API std::string findMetaData(const SequencePtr&, const StringList&, bool, bool&);
-SLICE_API std::string findMetaData(const StringList&, bool);
+                                               const std::string& = "", const StringList& = StringList(), int = 0);
+
+SLICE_API std::string getEndArg(const TypePtr&, const StringList&, const std::string&);
+SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const TypePtr&, const StringList&);
+
+SLICE_API std::string findMetaData(const SequencePtr&, const StringList&, bool&, int = 0);
+SLICE_API std::string findMetaData(const StringList&, int = 0);
 SLICE_API bool inWstringModule(const SequencePtr&);
 
 }