diff options
Diffstat (limited to 'cpp/src/slice2cs/Gen.cpp')
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index a4e0baee242..e16e3f67600 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -735,7 +735,7 @@ Slice::CsVisitor::writeDispatchAndMarshalling(const ClassDefPtr& p, bool stream) string memberType = typeToString((*d)->type()); _out << nl << "_instance." << memberName << " = (" << memberType << ")v;"; ContainedPtr contained = ContainedPtr::dynamicCast((*d)->type()); - string sliceId = contained ? contained->scoped() : "::Ice::Object"; + string sliceId = contained ? contained->scoped() : string("::Ice::Object"); _out << nl << "_typeId = \"" << sliceId << "\";"; if(allClassMembers.size() > 1) { @@ -2029,7 +2029,7 @@ Slice::Gen::TypesVisitor::visitExceptionEnd(const ExceptionPtr& p) string memberType = typeToString((*q)->type()); _out << nl << "_instance." << memberName << " = (" << memberType << ")v;"; ContainedPtr contained = ContainedPtr::dynamicCast((*q)->type()); - string sliceId = contained ? contained->scoped() : "::Ice::Object"; + string sliceId = contained ? contained->scoped() : string("::Ice::Object"); _out << nl << "_typeId = \"" << sliceId << "\";"; if(allClassMembers.size() > 1) { @@ -2387,7 +2387,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p) string memberName = fixId((*q)->name(), isClass ? DotNet::ICloneable : 0); _out << nl << "_instance." << memberName << " = (" << memberType << ")v;"; ContainedPtr contained = ContainedPtr::dynamicCast((*q)->type()); - string sliceId = contained ? contained->scoped() : "::Ice::Object"; + string sliceId = contained ? contained->scoped() : string("::Ice::Object"); _out << nl << "_typeId = \"" << sliceId << "\";"; if(classMembers.size() > 1) { @@ -3643,9 +3643,9 @@ Slice::Gen::HelperVisitor::visitDictionary(const DictionaryPtr& p) } _out << " e__ in v__)"; _out << sb; - string keyArg = isNewMapping ? "e__.Key" : "((" + keyS + ")e__.Key)"; + string keyArg = isNewMapping ? string("e__.Key") : "((" + keyS + ")e__.Key)"; writeMarshalUnmarshalCode(_out, key, keyArg, true, false, false); - string valueArg = isNewMapping ? "e__.Value" : "((" + valueS + ")e__.Value)"; + string valueArg = isNewMapping ? string("e__.Value") : "((" + valueS + ")e__.Value)"; writeMarshalUnmarshalCode(_out, value, valueArg, true, false, false); _out << eb; _out << eb; @@ -4053,7 +4053,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) { _out << nl << retS << " ret__;"; ContainedPtr contained = ContainedPtr::dynamicCast(ret); - string sliceId = contained ? contained->scoped() : "::Ice::Object"; + string sliceId = contained ? contained->scoped() : string("::Ice::Object"); _out << nl << "IceInternal.ParamPatcher<" << retS << "> ret___PP = new IceInternal.ParamPatcher<" << retS << ">(\"" << sliceId << "\");"; _out << nl << "is__.readObject(ret___PP);"; |