diff options
| author | Jose <jose@zeroc.com> | 2019-06-07 11:33:31 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-07 11:33:31 +0200 |
| commit | 7d9486b9113d5bbb533ced14d4e145faf97dcda2 (patch) | |
| tree | 6c7899e633ddf97c03df49156b1483b23010da3b /cpp/src/slice2cpp | |
| parent | Fix code format fixes (diff) | |
| parent | JavaScript browser testing fixes (diff) | |
| download | ice-7d9486b9113d5bbb533ced14d4e145faf97dcda2.tar.bz2 ice-7d9486b9113d5bbb533ced14d4e145faf97dcda2.tar.xz ice-7d9486b9113d5bbb533ced14d4e145faf97dcda2.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 14 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/msbuild/packages.config | 1 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index afb8f2976c7..0b3347f936e 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -6747,12 +6747,17 @@ Slice::Gen::Cpp11ProxyVisitor::visitClassDefStart(const ClassDefPtr& p) writeDocSummary(H, p); H << nl << "class " << _dllClassExport << p->name() << "Prx : public virtual " << getUnqualified("::Ice::Proxy", scope) << "<" << fixKwd(p->name() + "Prx") << ", "; - if(bases.empty() || (base && base->allOperations().empty())) + if(bases.empty() || (bases.size() == 1 && base && base->allOperations().empty())) { H << getUnqualified("::Ice::ObjectPrx", scope); } else { + if(base && base->allOperations().empty()) + { + bases.pop_front(); + } + ClassList::const_iterator q = bases.begin(); while(q != bases.end()) { @@ -7877,12 +7882,17 @@ Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p) writeDocSummary(H, p); H << nl << "class " << _dllExport << name << " : "; H.useCurrentPosAsIndent(); - if(bases.empty() || (base && base->allOperations().empty())) + if(bases.empty() || (base && bases.size() == 1 && base->allOperations().empty())) { H << "public virtual " << getUnqualified("::Ice::Object", scope); } else { + if(base && base->allOperations().empty()) + { + bases.pop_front(); + } + ClassList::const_iterator q = bases.begin(); while(q != bases.end()) { diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config index 8386dfda383..f32d6075d02 100644 --- a/cpp/src/slice2cpp/msbuild/packages.config +++ b/cpp/src/slice2cpp/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> <package id="mcpp.v141" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v142" version="2.7.2.17" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj index 06e04f61303..4b6529dbbb2 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj @@ -128,6 +128,7 @@ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> @@ -138,5 +139,6 @@ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets'))" /> </Target> </Project>
\ No newline at end of file |