Move writing of G_GNUC_DEPRECATED down to CCodeDeclarator implementations

Doing so in CCodeDeclaration is error-prone. CCodeVariableDeclarator still
requires special handling which isn't done here.

2 files changed, 12 insertions, 0 deletions

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 35de6deda..1f47af9c8 100644
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -1072,6 +1072,10 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
 		} else if (m.scanf_format) {
 			func.modifiers |= CCodeModifiers.SCANF;
 		}
+
+		if (m.version.deprecated) {
+			func.modifiers |= CCodeModifiers.DEPRECATED;
+		}
 	}
 
 	public void generate_vfunc (Method m, DataType return_type, Map<int,CCodeParameter> cparam_map, Map<int,CCodeExpression> carg_map, string suffix = "", int direction = 3) {
@@ -1147,6 +1151,10 @@ public abstract class Vala.CCodeMethodModule : CCodeStructModule {
 			vfunc.modifiers |= CCodeModifiers.SCANF;
 		}
 
+		if (m.version.deprecated) {
+			vfunc.modifiers |= CCodeModifiers.DEPRECATED;
+		}
+
 		cfile.add_function (vfunc);
 
 		pop_context ();
diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index 654383fae..7e5639f60 100644
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -393,6 +393,10 @@ public class Vala.GTypeModule : GErrorModule {
 			vdeclarator.modifiers |= CCodeModifiers.SCANF;
 		}
 
+		if (m.version.deprecated) {
+			vdeclarator.modifiers |= CCodeModifiers.DEPRECATED;
+		}
+
 		generate_cparameters (m, decl_space, cparam_map, new CCodeFunction ("fake"), vdeclarator);
 
 		var vdecl = new CCodeDeclaration (get_ccode_name (creturn_type));