Re: [PATCH 14/18] poison "using"

[Jan Kratochvil <jan dot kratochvil at redhat dot com>]

On Wed, 09 Oct 2013 19:17:29 +0200, Ondrej Oprala wrote:
[...]
> --- a/gdb/ChangeLog
> +++ b/gdb/ChangeLog
> @@ -17,6 +17,11 @@
>  
>  2013-10-09  Tom Tromey  <tromey@redhat.com>
>  
> + * block.c (using_direct) : Renamed from using.
> + * block.h (using_direct) : Likewise.

ChangeLog is not correct, described elsewhere.


> +
> +2013-10-09  Tom Tromey  <tromey@redhat.com>
> +
>   * ada-lang.c (type_name) : Renamed from typename.
>   * break-catch-throw.c (type_name) : Likewise.
>   * cp-valprint.c (type_name) : Likewise.
> diff --git a/gdb/block.c b/gdb/block.c
> index 643e144..7d1700e 100644
> --- a/gdb/block.c
> +++ b/gdb/block.c
[...]
> -/* Set BLOCK's using member to USING; if needed, allocate memory via
> -   OBSTACK.  (It won't make a copy of USING, however, so that already
> +/* Set BLOCK's using member to USING_DIRECT; if needed, allocate memory via
> +   OBSTACK.  (It won't make a copy of USING_DIRECT, however, so that already
>     has to be allocated correctly.)  */
>  
>  void
>  block_set_using (struct block *block,
> -		 struct using_direct *using,
> +		 struct using_direct *using_direct,
>  		 struct obstack *obstack)
>  {
[...]
> --- a/gdb/block.h
> +++ b/gdb/block.h
> @@ -170,7 +170,7 @@ extern void block_set_scope (struct block *block, const char *scope,
>  extern struct using_direct *block_using (const struct block *block);
>  
>  extern void block_set_using (struct block *block,
> -			     struct using_direct *using,
> +			     struct using_direct *using_dir,

Function defintion uses name 'using_direct' so it should be in sync here.

>  			     struct obstack *obstack);
>  
>  extern const struct block *block_static_block (const struct block *block);
> -- 
> 1.8.3.1


Thanks,
Jan