This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

C++ PATCH: minor cleanups



This patch just contains a few trivial cleanups.

--
Mark Mitchell                   mark@codesourcery.com
CodeSourcery, LLC               http://www.codesourcery.com

2000-03-21  Mark Mitchell  <mark@codesourcery.com>

	* cp-tree.h (CLASSTYPE_VBASECLASSES): Fix typo in comment.
	(fntype_p): Remove.
	* search.c (dfs_skip_nonprimary_vbases_unmarkedp): Fix typo in
	comment. 
	(dfs_skip_nonprimary_vbases_markedp): Likewise.
	* typeck.c (fntype_p): Remove.

Index: cp-tree.h
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/cp-tree.h,v
retrieving revision 1.423
diff -c -p -r1.423 cp-tree.h
*** cp-tree.h	2000/03/22 00:50:51	1.423
--- cp-tree.h	2000/03/22 01:19:32
*************** struct lang_type
*** 1562,1568 ****
  
     there will be two copies of `A' and `B' in the TYPE_BINFO hierarchy
     for `E'.  On the CLASSTYPE_VBASECLASSES list, there will be just
!    one copy of `A' (distinct from the other two) with its own copy of `B'
     (also distinct from the copies in the TYPE_BINFO hierarchy.)  */
  #define CLASSTYPE_VBASECLASSES(NODE) (TYPE_LANG_SPECIFIC(NODE)->vbases)
  
--- 1562,1568 ----
  
     there will be two copies of `A' and `B' in the TYPE_BINFO hierarchy
     for `E'.  On the CLASSTYPE_VBASECLASSES list, there will be just
!    one copy of `B' (distinct from the other two) with its own copy of `A'
     (also distinct from the copies in the TYPE_BINFO hierarchy.)  */
  #define CLASSTYPE_VBASECLASSES(NODE) (TYPE_LANG_SPECIFIC(NODE)->vbases)
  
*************** extern tree require_complete_type		PARAM
*** 4388,4394 ****
  extern tree complete_type			PARAMS ((tree));
  extern tree complete_type_or_else               PARAMS ((tree, tree));
  extern int type_unknown_p			PARAMS ((tree));
- extern int fntype_p				PARAMS ((tree));
  extern tree commonparms				PARAMS ((tree, tree));
  extern tree original_type			PARAMS ((tree));
  extern tree common_type				PARAMS ((tree, tree));
--- 4388,4393 ----
Index: search.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/search.c,v
retrieving revision 1.164
diff -c -p -r1.164 search.c
*** search.c	2000/03/21 18:10:45	1.164
--- search.c	2000/03/22 01:19:34
*************** dfs_skip_nonprimary_vbases_unmarkedp (bi
*** 2166,2172 ****
       void *data ATTRIBUTE_UNUSED;
  {
    if (TREE_VIA_VIRTUAL (binfo) && !BINFO_PRIMARY_MARKED_P (binfo))
!     /* This is a non-primary virtual base.  SKip it.  */
      return NULL_TREE;
  
    return unmarkedp (binfo, NULL);
--- 2166,2172 ----
       void *data ATTRIBUTE_UNUSED;
  {
    if (TREE_VIA_VIRTUAL (binfo) && !BINFO_PRIMARY_MARKED_P (binfo))
!     /* This is a non-primary virtual base.  Skip it.  */
      return NULL_TREE;
  
    return unmarkedp (binfo, NULL);
*************** dfs_skip_nonprimary_vbases_markedp (binf
*** 2181,2187 ****
       void *data ATTRIBUTE_UNUSED;
  {
    if (TREE_VIA_VIRTUAL (binfo) && !BINFO_PRIMARY_MARKED_P (binfo))
!     /* This is a non-primary virtual base.  SKip it.  */
      return NULL_TREE;
  
    return markedp (binfo, NULL);
--- 2181,2187 ----
       void *data ATTRIBUTE_UNUSED;
  {
    if (TREE_VIA_VIRTUAL (binfo) && !BINFO_PRIMARY_MARKED_P (binfo))
!     /* This is a non-primary virtual base.  Skip it.  */
      return NULL_TREE;
  
    return markedp (binfo, NULL);
Index: typeck.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/cp/typeck.c,v
retrieving revision 1.268
diff -c -p -r1.268 typeck.c
*** typeck.c	2000/03/21 18:10:46	1.268
--- typeck.c	2000/03/22 01:19:38
*************** type_unknown_p (exp)
*** 198,215 ****
  	      && TREE_TYPE (TREE_TYPE (exp)) == unknown_type_node));
  }
  
- /* Return truthvalue of whether T is function (or pfn) type.  */
- 
- int
- fntype_p (t)
-      tree t;
- {
-   return (TREE_CODE (t) == FUNCTION_TYPE || TREE_CODE (t) == METHOD_TYPE
- 	  || (TREE_CODE (t) == POINTER_TYPE
- 	      && (TREE_CODE (TREE_TYPE (t)) == FUNCTION_TYPE
- 		  || TREE_CODE (TREE_TYPE (t)) == METHOD_TYPE)));
- }
- 
  /* Return a variant of TYPE which has all the type qualifiers of LIKE
     as well as those of TYPE.  */
  
--- 198,203 ----

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]