diff options
| author | Jürg Billeter <j@bitron.ch> | 2009-01-10 12:37:46 +0000 |
|---|---|---|
| committer | Jürg Billeter <juergbi@src.gnome.org> | 2009-01-10 12:37:46 +0000 |
| commit | 3046d0e0ae5aebf1cb68d39e5cd7edbc70d1c1ff (patch) | |
| tree | c623ad9fb88d95fbc3d4d9848a6bbb4af45ed79e /vala/valareturnstatement.vala | |
| parent | 9cab8051e3eae7e91e895c2e11848642b8f62629 (diff) | |
| download | vala-3046d0e0ae5aebf1cb68d39e5cd7edbc70d1c1ff.tar.gz | |
Remove --disable-non-null option after transition period of 9 months
2009-01-10 Jürg Billeter <j@bitron.ch>
* vala/valacodecontext.vala:
* vala/valaformalparameter.vala:
* vala/valareturnstatement.vala:
* vala/valasemanticanalyzer.vala:
* gobject/valaccodemethodmodule.vala:
* compiler/valacompiler.vala:
Remove --disable-non-null option after transition period
of 9 months
svn path=/trunk/; revision=2320
Diffstat (limited to 'vala/valareturnstatement.vala')
| -rw-r--r-- | vala/valareturnstatement.vala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vala/valareturnstatement.vala b/vala/valareturnstatement.vala index c9c99ea8a..2f6a2bd88 100644 --- a/vala/valareturnstatement.vala +++ b/vala/valareturnstatement.vala @@ -1,6 +1,6 @@ /* valareturnstatement.vala * - * Copyright (C) 2006-2008 Jürg Billeter + * Copyright (C) 2006-2009 Jürg Billeter * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -132,7 +132,7 @@ public class Vala.ReturnStatement : CodeNode, Statement { Report.warning (source_reference, "Local variable with strong reference used as return value and method return type hasn't been declared to transfer ownership"); } - if (analyzer.context.non_null && return_expression is NullLiteral + if (return_expression is NullLiteral && !analyzer.current_return_type.nullable) { Report.warning (source_reference, "`null' incompatible with return type `%s`".printf (analyzer.current_return_type.to_string ())); } |