public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r10-10805] C-family : Fix a C++ ODR violation [PR97854].
@ 2022-05-31 18:13 Iain D Sandoe
0 siblings, 0 replies; only message in thread
From: Iain D Sandoe @ 2022-05-31 18:13 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:5dd5507265e3b7fecd775a106a20762a5e828421
commit r10-10805-g5dd5507265e3b7fecd775a106a20762a5e828421
Author: Iain Sandoe <iain@sandoe.co.uk>
Date: Mon Nov 16 19:33:35 2020 +0000
C-family : Fix a C++ ODR violation [PR97854].
The changes in r11-4799 introduced a dummy enum rid type with
a different initial member name to the actual version (an ODR
violation). Fixed by including the header declaring the
actual type.
gcc/c-family/ChangeLog:
PR objc/97854
* stub-objc.c: Include c-common.h to declare enum rid.
(cherry picked from commit 814e016318646d06b1662219cc716d502b76d8ce)
Diff:
---
gcc/c-family/stub-objc.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c
index 2f535578789..f9fe66abb99 100644
--- a/gcc/c-family/stub-objc.c
+++ b/gcc/c-family/stub-objc.c
@@ -25,10 +25,7 @@ along with GCC; see the file COPYING3. If not see
#include "tree.h"
#include "vec.h"
-/* Provide a dummy type for the RID enum used as an argument to
- objc_prop_attr_kind_for_rid () */
-enum rid { DUMMY };
-
+#include "c-common.h" /* for enum rid. */
#include "c-objc.h"
tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-05-31 18:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-31 18:13 [gcc r10-10805] C-family : Fix a C++ ODR violation [PR97854] Iain D Sandoe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).