ccode: Fix and disable deprecating EnumValue

This still requires GCC 6.0 and later to work.
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47043

diff --git a/ccode/valaccodeenumvalue.vala b/ccode/valaccodeenumvalue.vala
index e952f4b90bc4725ffd795055c0b6c329466f825c..2fa4085873f2172d7d7b2411fc0257466eba7d77 100644 (file)
--- a/ccode/valaccodeenumvalue.vala
+++ b/ccode/valaccodeenumvalue.vala
@@ -43,12 +43,14 @@ public class Vala.CCodeEnumValue : CCodeNode {
 
        public override void write (CCodeWriter writer) {
                writer.write_string (name);
+               if (CCodeModifiers.DEPRECATED in modifiers) {
+                       // FIXME Requires GCC 6.0 to work at this place
+                       // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=47043
+                       //writer.write_string (" G_GNUC_DEPRECATED");
+               }
                if (value != null) {
                        writer.write_string (" = ");
                        value.write (writer);
                }
-               if (CCodeModifiers.DEPRECATED in modifiers) {
-                       writer.write_string (" G_GNUC_DEPRECATED");
-               }
        }
 }

diff --git a/tests/annotations/deprecated.vala b/tests/annotations/deprecated.vala
index 91ed21ee87cec661001c5996582f33ce489a7557..0968b15389e6eaddf0624e7755f63287372d6f63 100644 (file)
--- a/tests/annotations/deprecated.vala
+++ b/tests/annotations/deprecated.vala
@@ -32,7 +32,9 @@ void test_class_property () {
 [Version (deprecated = true)]
 enum FooEnum {
        [Version (deprecated = true)]
-       BAR,
+       BAR = 0,
+       [Version (deprecated = true)]
+       FOO,
        BAZ;
 }