diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-01-03 18:55:18 +0100 |
|---|---|---|
| committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-01-04 14:38:11 +0100 |
| commit | 4e3103bfd1928b080df77b68e6015fae609ad351 (patch) | |
| tree | a30c7ae1f00a24a9b76e4770735dd7e1a4be6d6d /ccode | |
| parent | 76efeb6f154d2826950b191c978ddd82a5d569dd (diff) | |
| download | vala-4e3103bfd1928b080df77b68e6015fae609ad351.tar.gz | |
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.
Diffstat (limited to 'ccode')
| -rw-r--r-- | ccode/valaccodedeclaration.vala | 4 | ||||
| -rw-r--r-- | ccode/valaccodefunctiondeclarator.vala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ccode/valaccodedeclaration.vala b/ccode/valaccodedeclaration.vala index 4d0fa7425..4cbd86204 100644 --- a/ccode/valaccodedeclaration.vala +++ b/ccode/valaccodedeclaration.vala @@ -96,10 +96,6 @@ public class Vala.CCodeDeclaration : CCodeStatement { decl.write (writer); } - if (CCodeModifiers.DEPRECATED in modifiers) { - writer.write_string (" G_GNUC_DEPRECATED"); - } - writer.write_string (";"); writer.write_newline (); return; diff --git a/ccode/valaccodefunctiondeclarator.vala b/ccode/valaccodefunctiondeclarator.vala index b195f5ae3..30f0c63b1 100644 --- a/ccode/valaccodefunctiondeclarator.vala +++ b/ccode/valaccodefunctiondeclarator.vala @@ -77,6 +77,10 @@ public class Vala.CCodeFunctionDeclarator : CCodeDeclarator { writer.write_string (")"); + if (CCodeModifiers.DEPRECATED in modifiers) { + writer.write_string (" G_GNUC_DEPRECATED"); + } + if (CCodeModifiers.PRINTF in modifiers) { format_arg_index = (format_arg_index >= 0 ? format_arg_index + 1 : args_index); writer.write_string (" G_GNUC_PRINTF(%d,%d)".printf (format_arg_index, args_index + 1)); |