From patchwork Mon Nov 16 16:04:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 9690 Received: (qmail 66852 invoked by alias); 16 Nov 2015 16:04:34 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 66840 invoked by uid 89); 16 Nov 2015 16:04:33 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.8 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 16 Nov 2015 16:04:32 +0000 Received: from EUSAAHC002.ericsson.se (Unknown_Domain [147.117.188.78]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id E0.49.32596.D9C99465; Mon, 16 Nov 2015 10:06:37 +0100 (CET) Received: from elxcz23q12-y4.dyn.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.78) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 16 Nov 2015 11:04:29 -0500 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Fix C++ build errors on OpenBSD Date: Mon, 16 Nov 2015 11:04:25 -0500 Message-ID: <1447689865-25969-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes Fixes two instances of: /root/binutils-gdb/gdb/cp-namespace.c: In function 'block_symbol cp_lookup_nested_symbol(type*, const char*, const block*, domain_enum)': /root/binutils-gdb/gdb/cp-namespace.c:1010: warning: jump to case label /root/binutils-gdb/gdb/cp-namespace.c:1008: error: crosses initialization of 'block_symbol ' Compiler info: Reading specs from /usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/specs Target: amd64-unknown-openbsd5.8 Configured with: OpenBSD/amd64 system compiler Thread model: posix gcc version 4.2.1 20070719 gdb/ChangeLog: * cp-namespace.c (cp_lookup_nested_symbol): Add curly braces in switch case. * d-namespace.c (d_lookup_nested_symbol): Likewise. --- gdb/cp-namespace.c | 16 +++++++++------- gdb/d-namespace.c | 4 +++- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c index 989544b..d74cb92 100644 --- a/gdb/cp-namespace.c +++ b/gdb/cp-namespace.c @@ -999,13 +999,15 @@ cp_lookup_nested_symbol (struct type *parent_type, case TYPE_CODE_FUNC: case TYPE_CODE_METHOD: - if (symbol_lookup_debug) - { - fprintf_unfiltered (gdb_stdlog, - "cp_lookup_nested_symbol (...) = NULL" - " (func/method)\n"); - } - return (struct block_symbol) {NULL, NULL}; + { + if (symbol_lookup_debug) + { + fprintf_unfiltered (gdb_stdlog, + "cp_lookup_nested_symbol (...) = NULL" + " (func/method)\n"); + } + return (struct block_symbol) {NULL, NULL}; + } default: internal_error (__FILE__, __LINE__, diff --git a/gdb/d-namespace.c b/gdb/d-namespace.c index e8f4c6f..a59a7c5 100644 --- a/gdb/d-namespace.c +++ b/gdb/d-namespace.c @@ -370,7 +370,9 @@ d_lookup_nested_symbol (struct type *parent_type, case TYPE_CODE_FUNC: case TYPE_CODE_METHOD: - return (struct block_symbol) {NULL, NULL}; + { + return (struct block_symbol) {NULL, NULL}; + } default: gdb_assert_not_reached ("called with non-aggregate type.");