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/src/Slice | |
| 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/src/Slice')
| -rw-r--r-- | cpp/src/Slice/CPlusPlusUtil.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp index e04291a02ee..95b34a2ec66 100644 --- a/cpp/src/Slice/CPlusPlusUtil.cpp +++ b/cpp/src/Slice/CPlusPlusUtil.cpp @@ -297,7 +297,7 @@ writeParamEndCode(Output& out, const TypePtr& type, bool optional, const string& void writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const OperationPtr& op, bool marshal, bool prepend, int typeCtx) { - string prefix = prepend ? "__p_" : ""; + string prefix = prepend ? paramPrefix : ""; // // Marshal non optional parameters. @@ -361,6 +361,7 @@ writeMarshalUnmarshalParams(Output& out, const ParamDeclList& params, const Oper } Slice::FeatureProfile Slice::featureProfile = Slice::Ice; +string Slice::paramPrefix = "__p_"; char Slice::ToIfdef::operator()(char c) @@ -948,7 +949,7 @@ Slice::writeUnmarshalCode(Output& out, const ParamDeclList& params, const Operat void Slice::writeAllocateCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx) { - string prefix = prepend ? "__p_" : ""; + string prefix = prepend ? paramPrefix : ""; for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p) { writeParamAllocateCode(out, (*p)->type(), (*p)->optional(), fixKwd(prefix + (*p)->name()), (*p)->getMetaData(), @@ -1004,11 +1005,12 @@ Slice::getEndArg(const TypePtr& type, const StringList& metaData, const string& } void -Slice::writeEndCode(Output& out, const ParamDeclList& params, const OperationPtr& op) +Slice::writeEndCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend) { + string prefix = prepend ? paramPrefix : ""; for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p) { - writeParamEndCode(out, (*p)->type(), (*p)->optional(), fixKwd((*p)->name()), (*p)->getMetaData()); + writeParamEndCode(out, (*p)->type(), (*p)->optional(), fixKwd(prefix + (*p)->name()), (*p)->getMetaData()); } if(op && op->returnType()) { |