diff options
author | Mike Stump <mrs@gcc.gnu.org> | 1996-02-28 22:01:56 +0000 |
---|---|---|
committer | Mike Stump <mrs@gcc.gnu.org> | 1996-02-28 22:01:56 +0000 |
commit | 5566b478bdfe8bfc554a57f2631c1d3646ac4ae2 (patch) | |
tree | 7e6683aeddf5dd90371df24d386ca3fd7048ee5c /gcc/cp/xref.c | |
parent | 8bd04c565300c201dca9307a5a9173ed31d02494 (diff) | |
download | gcc-5566b478bdfe8bfc554a57f2631c1d3646ac4ae2.zip gcc-5566b478bdfe8bfc554a57f2631c1d3646ac4ae2.tar.gz gcc-5566b478bdfe8bfc554a57f2631c1d3646ac4ae2.tar.bz2 |
83rd Cygnus<->FSF merge
From-SVN: r11362
Diffstat (limited to 'gcc/cp/xref.c')
-rw-r--r-- | gcc/cp/xref.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/gcc/cp/xref.c b/gcc/cp/xref.c index ec4b174..2645848 100644 --- a/gcc/cp/xref.c +++ b/gcc/cp/xref.c @@ -183,7 +183,7 @@ GNU_xref_end (ect) if (xf == NULL) return; while (cur_scope != NULL) - GNU_xref_end_scope(cur_scope->gid,0,0,0,0); + GNU_xref_end_scope(cur_scope->gid,0,0,0); doing_xref = 0; @@ -275,10 +275,10 @@ GNU_xref_start_scope (id) TRNS is ??? */ void -GNU_xref_end_scope (id,inid,prm,keep,trns) +GNU_xref_end_scope (id,inid,prm,keep) HOST_WIDE_INT id; HOST_WIDE_INT inid; - int prm,keep,trns; + int prm,keep; { XREF_FILE xf; XREF_SCOPE xs,lxs,oxs; @@ -400,7 +400,7 @@ GNU_xref_decl (fndecl,decl) } else if (TREE_CODE (decl) == TEMPLATE_DECL) { - if (DECL_TEMPLATE_IS_CLASS (decl)) + if (TREE_CODE (DECL_RESULT (decl)) == TYPE_DECL) cls = "CLASSTEMP"; else if (TREE_CODE (DECL_RESULT (decl)) == FUNCTION_DECL) cls = "FUNCTEMP"; @@ -599,7 +599,9 @@ GNU_xref_member(cls, fld) char *prot; int confg, pure; char *d; +#ifdef XREF_SHORT_MEMBER_NAMES int i; +#endif char buf[1024], bufa[1024]; if (!doing_xref) return; @@ -622,7 +624,9 @@ GNU_xref_member(cls, fld) d = IDENTIFIER_POINTER(cls); sprintf(buf, "%d%s", strlen(d), d); +#ifdef XREF_SHORT_MEMBER_NAMES i = strlen(buf); +#endif strcpy(bufa, declname(fld)); #ifdef XREF_SHORT_MEMBER_NAMES |