diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-02-23 10:44:27 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-02-23 10:44:27 -0330 |
| commit | 043fc8f6a2a686d5a3f75fb1fa157c9c56b36f90 (patch) | |
| tree | 738012d132dea9aa6c4145035b703896e3c7770e /cpp/include | |
| parent | Update default location of third party packages in OS X (diff) | |
| download | ice-043fc8f6a2a686d5a3f75fb1fa157c9c56b36f90.tar.bz2 ice-043fc8f6a2a686d5a3f75fb1fa157c9c56b36f90.tar.xz ice-043fc8f6a2a686d5a3f75fb1fa157c9c56b36f90.zip | |
ICE-5814 fixed gcc compile errors
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Slice/CPlusPlusUtil.h | 11 |
1 files changed, 6 insertions, 5 deletions
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&); |