1 files changed, 12 insertions, 8 deletions
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 9338bfe32cd..6f25e95ea9c 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -32,15 +32,17 @@ const int TypeContextInParam = 1;
 const int TypeContextAMIEnd = 2;
 const int TypeContextAMIPrivateEnd = 4;
 const int TypeContextAMICallPrivateEnd = 8;
-
 const int TypeContextUseWstring = 16;
+const int TypeContextReadClosure = 32;
+
+SLICE_API bool isMovable(const TypePtr&);
 
-SLICE_API std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0);
-SLICE_API std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string operationModeToString(Operation::Mode);
+SLICE_API std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string operationModeToString(Operation::Mode, bool cpp11 = false);
 SLICE_API std::string opFormatTypeToString(const OperationPtr&);
 
 SLICE_API std::string fixKwd(const std::string&);
@@ -51,11 +53,13 @@ SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypeP
 
 SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
 SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
-SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
+SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0, bool = false);
 
 SLICE_API std::string getEndArg(const TypePtr&, const StringList&, const std::string&);
 SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false);
 
+SLICE_API bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&);
+SLICE_API bool findMetaData(const std::string&, const StringList&, std::string&);
 SLICE_API std::string findMetaData(const StringList&, int = 0);
 SLICE_API bool inWstringModule(const SequencePtr&);