From 043fc8f6a2a686d5a3f75fb1fa157c9c56b36f90 Mon Sep 17 00:00:00 2001 From: Dwayne Boone Date: Mon, 23 Feb 2015 10:44:27 -0330 Subject: ICE-5814 fixed gcc compile errors --- cpp/include/Slice/CPlusPlusUtil.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'cpp/include/Slice/CPlusPlusUtil.h') diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h index a5d42eb91cd..9338bfe32cd 100644 --- a/cpp/include/Slice/CPlusPlusUtil.h +++ b/cpp/include/Slice/CPlusPlusUtil.h @@ -17,6 +17,7 @@ namespace Slice { SLICE_API extern FeatureProfile featureProfile; +SLICE_API extern std::string paramPrefix; struct ToIfdef { @@ -47,13 +48,13 @@ SLICE_API std::string fixKwd(const std::string&); SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypePtr&, bool, int, const std::string&, bool, const StringList& = StringList(), int = 0, const std::string& = "", bool = true); - -SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool prepend, int = 0); -SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool prepend, int = 0); -SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool prepend, int = 0); + +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 std::string getEndArg(const TypePtr&, const StringList&, const std::string&); -SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&); +SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false); SLICE_API std::string findMetaData(const StringList&, int = 0); SLICE_API bool inWstringModule(const SequencePtr&); -- cgit v1.2.3