From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10747 invoked by alias); 13 Dec 2011 03:41:33 -0000 Received: (qmail 10691 invoked by uid 22791); 13 Dec 2011 03:41:31 -0000 X-SWARE-Spam-Status: No, hits=-2.7 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-iy0-f169.google.com (HELO mail-iy0-f169.google.com) (209.85.210.169) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 13 Dec 2011 03:41:18 +0000 Received: by mail-iy0-f169.google.com with SMTP id k25so11422575iah.0 for ; Mon, 12 Dec 2011 19:41:17 -0800 (PST) Received: by 10.42.202.17 with SMTP id fc17mr14226921icb.15.1323747677882; Mon, 12 Dec 2011 19:41:17 -0800 (PST) Received: from localhost.localdomain (c-24-18-115-186.hsd1.wa.comcast.net. [24.18.115.186]) by mx.google.com with ESMTPS id e2sm81168651ibe.0.2011.12.12.19.41.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Dec 2011 19:41:17 -0800 (PST) From: Andrey Smirnov To: gdb-patches@sourceware.org Cc: Andrey Smirnov Subject: [PATCH 048/238] [index] cp-abi.c: -Wshadow fix Date: Tue, 13 Dec 2011 03:41:00 -0000 Message-Id: <1323747545-29987-14-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: <1323747545-29987-1-git-send-email-andrew.smirnov@gmail.com> References: <1323747545-29987-1-git-send-email-andrew.smirnov@gmail.com> X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2011-12/txt/msg00372.txt.bz2 To ChangeLog: * cp-abi.c (baseclass_offset): Rename `index' to `idx'(-Wshadow). --- gdb/cp-abi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gdb/cp-abi.c b/gdb/cp-abi.c index 82a164e..9ff49f9 100644 --- a/gdb/cp-abi.c +++ b/gdb/cp-abi.c @@ -70,7 +70,7 @@ is_operator_name (const char *name) } int -baseclass_offset (struct type *type, int index, const gdb_byte *valaddr, +baseclass_offset (struct type *type, int idx, const gdb_byte *valaddr, int embedded_offset, CORE_ADDR address, const struct value *val) { @@ -81,7 +81,7 @@ baseclass_offset (struct type *type, int index, const gdb_byte *valaddr, TRY_CATCH (ex, RETURN_MASK_ERROR) { - res = (*current_cp_abi.baseclass_offset) (type, index, valaddr, + res = (*current_cp_abi.baseclass_offset) (type, idx, valaddr, embedded_offset, address, val); } -- 1.7.5.4