# HG changeset patch
# User Rik <rik@octave.org>
# Date 1607367187 28800
# Node ID b42c2c27a330f7c6eb746519873cfa9a49bfd073
# Parent  be61ce9c3126aa127e605b426b13460874e1dc77# Parent  b3f34a22b3fe7c0d76c53defd28cbdf096cd754d
maint: merge stable to default.

diff -r be61ce9c3126 -r b42c2c27a330 libinterp/octave-value/cdef-utils.cc
--- a/libinterp/octave-value/cdef-utils.cc	Mon Dec 07 19:04:55 2020 +0100
+++ b/libinterp/octave-value/cdef-utils.cc	Mon Dec 07 10:53:07 2020 -0800
@@ -210,7 +210,9 @@
 
         for (int i = 0; ! retval && i < c.numel (); i++)
           {
-            cdef_class cls = lookup_class (c(i));
+            octave_classdef *metacls = c(i).classdef_object_value ();
+            std::string clsname = metacls->get_property (0, "Name").string_value ();
+            cdef_class cls = lookup_class (clsname);
 
             retval = is_superclass (clsa, cls, true,
                                     max_depth < 0 ? max_depth : max_depth-1);