diff options
| author | Iain Sandoe <iain@sandoe.co.uk> | 2020-11-16 19:33:35 +0000 |
|---|---|---|
| committer | Iain Sandoe <iain@sandoe.co.uk> | 2020-11-16 21:38:41 +0000 |
| commit | 814e016318646d06b1662219cc716d502b76d8ce (patch) | |
| tree | 674dfec22e6811aec93a743563f371766c36c70b | |
| parent | 0c81ccc3d87098b93b0e6a2dd76815e4d6e78ff0 (diff) | |
| download | gcc-814e016318646d06b1662219cc716d502b76d8ce.zip gcc-814e016318646d06b1662219cc716d502b76d8ce.tar.gz gcc-814e016318646d06b1662219cc716d502b76d8ce.tar.bz2 | |
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.
| -rw-r--r-- | gcc/c-family/stub-objc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/gcc/c-family/stub-objc.c b/gcc/c-family/stub-objc.c index 26941aa..1914432 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 |