From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id C21343857C6E; Mon, 20 Dec 2021 11:35:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C21343857C6E MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-6074] jit: Fix -Wodr warning X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 8d081c0093a42713afd1d4f7f07d09abb6eabc9a X-Git-Newrev: 7424323bd5e1e27d8ffe37257459db5b28af18d2 Message-Id: <20211220113547.C21343857C6E@sourceware.org> Date: Mon, 20 Dec 2021 11:35:47 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Dec 2021 11:35:47 -0000 https://gcc.gnu.org/g:7424323bd5e1e27d8ffe37257459db5b28af18d2 commit r12-6074-g7424323bd5e1e27d8ffe37257459db5b28af18d2 Author: Martin Liska Date: Mon Dec 20 11:31:50 2021 +0100 jit: Fix -Wodr warning gcc/jit/libgccjit.c:3957:8: warning: type 'struct version_info' violates the C++ One Definition Rule [-Wodr] ../../gcc/jit/libgccjit.c:3957:8: warning: type 'struct version_info' violates the C++ One Definition Rule [-Wodr] 3957 | struct version_info ../../gcc/tree-ssa-loop-ivopts.c:181: note: a different type is defined in another translation unit 181 | struct version_info gcc/jit/ChangeLog: * libgccjit.c (struct version_info): Rename to jit_version_info. (struct jit_version_info): Likewise. (gcc_jit_version_major): Likewise. (gcc_jit_version_minor): Likewise. (gcc_jit_version_patchlevel): Likewise. Diff: --- gcc/jit/libgccjit.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gcc/jit/libgccjit.c b/gcc/jit/libgccjit.c index 5cb27a20d41..3d2d838dc4d 100644 --- a/gcc/jit/libgccjit.c +++ b/gcc/jit/libgccjit.c @@ -3954,11 +3954,11 @@ gcc_jit_context_new_rvalue_from_vector (gcc_jit_context *ctxt, static pthread_mutex_t version_mutex = PTHREAD_MUTEX_INITIALIZER; -struct version_info +struct jit_version_info { /* Default constructor. Populate via parse_basever, guarded by version_mutex. */ - version_info () + jit_version_info () { pthread_mutex_lock (&version_mutex); parse_basever (&major, &minor, &patchlevel); @@ -3974,21 +3974,21 @@ struct version_info extern int gcc_jit_version_major (void) { - version_info vi; + jit_version_info vi; return vi.major; } extern int gcc_jit_version_minor (void) { - version_info vi; + jit_version_info vi; return vi.minor; } extern int gcc_jit_version_patchlevel (void) { - version_info vi; + jit_version_info vi; return vi.patchlevel; }