Merge remote-tracking branch 'origin/3.7' into swift

1 files changed, 18 insertions, 6 deletions

diff --git a/cpp/src/slice2matlab/Main.cpp b/cpp/src/slice2matlab/Main.cpp
index 0b3de868384..353556bc814 100644
--- a/cpp/src/slice2matlab/Main.cpp
+++ b/cpp/src/slice2matlab/Main.cpp
@@ -1616,7 +1616,7 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
     const string name = fixIdent(p->name());
     const string scoped = p->scoped();
     const string abs = getAbsolute(p);
-    const ClassList bases = p->bases();
+    ClassList bases = p->bases();
     const OperationList allOps = p->allOperations();
     const string self = name == "obj" ? "this" : "obj";
 
@@ -2527,17 +2527,29 @@ CodeVisitor::visitClassDefStart(const ClassDefPtr& p)
         out.inc();
         out << nl << "function obj = " << prxName << "(communicator, encoding, impl, bytes)";
         out.inc();
-        if(!bases.empty())
+
+        ClassDefPtr base;
+        if(!bases.empty() && !bases.front()->isInterface())
+        {
+            base = bases.front();
+        }
+
+        if(bases.empty() || (bases.size() == 1 && base && base->allOperations().empty()))
         {
+            out << nl << "obj = obj@Ice.ObjectPrx(communicator, encoding, impl, bytes);";
+        }
+        else
+        {
+            if(base && base->allOperations().empty())
+            {
+                bases.pop_front();
+            }
+
             for(ClassList::const_iterator q = bases.begin(); q != bases.end(); ++q)
             {
                 out << nl << "obj = obj@" << getAbsolute(*q, "", "Prx") << "(communicator, encoding, impl, bytes);";
             }
         }
-        else
-        {
-            out << nl << "obj = obj@Ice.ObjectPrx(communicator, encoding, impl, bytes);";
-        }
         out.dec();
         out << nl << "end";
         out.dec();