Merge with CEDET upstream (rev. 8499).

[bpt/emacs.git] / lisp / cedet / semantic / db-el.el

diff --git a/lisp/cedet/semantic/db-el.el b/lisp/cedet/semantic/db-el.el
index 260f964..1b0f329 100644 (file)
--- a/lisp/cedet/semantic/db-el.el
+++ b/lisp/cedet/semantic/db-el.el
@@ -216,9 +216,8 @@ TOKTYPE is a hint to the type of tag desired."
            (symbol-name sym)
            "class"
            (semantic-elisp-desymbolify
-            (aref (class-v semanticdb-project-database)
-                  class-public-a)) ;; slots
-           (semantic-elisp-desymbolify (class-parents sym)) ;; parents
+            (eieio--class-public-a (class-v semanticdb-project-database))) ;; slots
+           (semantic-elisp-desymbolify (eieio-class-parents sym)) ;; parents
            ))
          ((not toktype)
           ;; Figure it out on our own.