Update CEDET from upstream.

1 files changed, 2 insertions, 20 deletions

diff --git a/lisp/cedet/semantic/analyze/fcn.el b/lisp/cedet/semantic/analyze/fcn.el
index a27356c784b..d780327b7e9 100644
--- a/lisp/cedet/semantic/analyze/fcn.el
+++ b/lisp/cedet/semantic/analyze/fcn.el
@@ -37,24 +37,6 @@
 ;;
 ;; These queries allow a major mode to help the analyzer make decisions.
 ;;
-(define-overloadable-function semantic-analyze-tag-prototype-p (tag)
-  "Non-nil if TAG is a prototype."
-  )
-
-(defun semantic-analyze-tag-prototype-p-default (tag)
-  "Non-nil if TAG is a prototype."
-  (let ((p (semantic-tag-get-attribute tag :prototype-flag)))
-    (cond
-     ;; Trust the parser author.
-     (p p)
-     ;; Empty types might be a prototype.
-     ((eq (semantic-tag-class tag) 'type)
-      (not (semantic-tag-type-members tag)))
-     ;; No other heuristics.
-     (t nil))
-    ))
-
-;;------------------------------------------------------------
 
 (define-overloadable-function semantic-analyze-split-name (name)
   "Split a tag NAME into a sequence.
@@ -219,7 +201,7 @@ used by the analyzer debugger."
     (if (and type-declaration
 	     (semantic-tag-p type-declaration)
 	     (semantic-tag-of-class-p type-declaration 'type)
-	     (not (semantic-analyze-tag-prototype-p type-declaration))
+	     (not (semantic-tag-prototype-p type-declaration))
 	     )
 	;; We have an anonymous type for TAG with children.
 	;; Use this type directly.
@@ -312,7 +294,7 @@ SCOPE is the current scope."
     (when (and (semantic-tag-p ans)
 	       (eq (semantic-tag-class ans) 'type))
       ;; We have a tag.
-      (if (semantic-analyze-tag-prototype-p ans)
+      (if (semantic-tag-prototype-p ans)
 	  ;; It is a prototype.. find the real one.
 	  (or (and scope
 		   (car-safe