[C++ Patch (documentation)] PR 19532

[C++ Patch (documentation)] PR 19532

[Paolo Carlini]

[-- Attachment #1: Type: text/plain, Size: 125 bytes --]

Hi,

tested x86_64-linux, also took the occasion to change the return type.

Ok for mainline?

Paolo.

/////////////////////

[-- Attachment #2: CL_19532 --]
[-- Type: text/plain, Size: 135 bytes --]

2007-08-05  Paolo Carlini  <pcarlini@suse.de>

	PR c++/19532
	* pt.c (template_class_depth): Fix comment; change return type
	to bool.

[-- Attachment #3: patch_19532 --]
[-- Type: text/plain, Size: 1902 bytes --]

Index: pt.c
===================================================================
*** pt.c	(revision 127225)
--- pt.c	(working copy)
*************** static int for_each_template_parm (tree,
*** 126,132 ****
  				   struct pointer_set_t*);
  static tree expand_template_argument_pack (tree);
  static tree build_template_parm_index (int, int, int, tree, tree);
! static int inline_needs_template_parms (tree);
  static void push_inline_template_parms_recursive (tree, int);
  static tree retrieve_local_specialization (tree);
  static void register_local_specialization (tree, tree);
--- 126,132 ----
  				   struct pointer_set_t*);
  static tree expand_template_argument_pack (tree);
  static tree build_template_parm_index (int, int, int, tree, tree);
! static bool inline_needs_template_parms (tree);
  static void push_inline_template_parms_recursive (tree, int);
  static tree retrieve_local_specialization (tree);
  static void register_local_specialization (tree, tree);
*************** template_class_depth (tree type)
*** 308,321 ****
    return depth;
  }
  
! /* Returns 1 if processing DECL as part of do_pending_inlines
!    needs us to push template parms.  */
  
! static int
  inline_needs_template_parms (tree decl)
  {
    if (! DECL_TEMPLATE_INFO (decl))
!     return 0;
  
    return (TMPL_PARMS_DEPTH (DECL_TEMPLATE_PARMS (most_general_template (decl)))
  	  > (processing_template_decl + DECL_TEMPLATE_SPECIALIZATION (decl)));
--- 308,321 ----
    return depth;
  }
  
! /* Subroutine of maybe_begin_member_template_processing.
!    Returns true if processing DECL needs us to push template parms.  */
  
! static bool
  inline_needs_template_parms (tree decl)
  {
    if (! DECL_TEMPLATE_INFO (decl))
!     return false;
  
    return (TMPL_PARMS_DEPTH (DECL_TEMPLATE_PARMS (most_general_template (decl)))
  	  > (processing_template_decl + DECL_TEMPLATE_SPECIALIZATION (decl)));

Re: [C++ Patch (documentation)] PR 19532

[Mark Mitchell]

Paolo Carlini wrote:
> Hi,
> 
> tested x86_64-linux, also took the occasion to change the return type.
> 
> Ok for mainline?

OK.

-- 
Mark Mitchell
CodeSourcery
mark@codesourcery.com
(650) 331-3385 x713

Re: [C++ Patch (documentation)] PR 19532

[Jason Merrill]

The ChangeLog for this patch has the wrong function name.  I'll fix it.

Jason

Re: [C++ Patch (documentation)] PR 19532

[Jason Merrill]

The ChangeLog for this patch has the wrong function name.  I'll fix it.

Jason

Re: [C++ Patch (documentation)] PR 19532

[Paolo Carlini]

Jason Merrill wrote:

> The ChangeLog for this patch has the wrong function name.  I'll fix it.

Thanks and sorry. At that time I was not very fluent diff -cp (we don't 
use it in the library) and misinterpreted the header pointing to the 
function name.

Paolo.