[vala/0.14] codegen: Use NULL as default C value for nullable structs
- From: JÃrg Billeter <juergbi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala/0.14] codegen: Use NULL as default C value for nullable structs
- Date: Tue, 31 Jan 2012 13:16:13 +0000 (UTC)
commit 77aaaf1a57e4a9076d7c9584283d6987553854eb
Author: Luca Bruno <lucabru src gnome org>
Date: Sun Dec 25 13:43:28 2011 +0100
codegen: Use NULL as default C value for nullable structs
Fixes bug 665904.
codegen/valaccodebasemodule.vala | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index f5ca0c0..8df5966 100644
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -5448,7 +5448,7 @@ public abstract class Vala.CCodeBaseModule : CodeGenerator {
public CCodeExpression? default_value_for_type (DataType type, bool initializer_expression) {
var st = type.data_type as Struct;
var array_type = type as ArrayType;
- if (type.data_type != null && get_ccode_default_value (type.data_type) != "") {
+ if (type.data_type != null && !type.nullable && get_ccode_default_value (type.data_type) != "") {
return new CCodeConstant (get_ccode_default_value (type.data_type));
} else if (initializer_expression && !type.nullable &&
(st != null || (array_type != null && array_type.fixed_length))) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]