[vala] codegen: Fix warning about copying delegate parameters in async method
- From: Luca Bruno <lucabru src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [vala] codegen: Fix warning about copying delegate parameters in async method
- Date: Wed, 22 Jun 2011 07:14:23 +0000 (UTC)
commit 5a7494ac7deaadeadaa8ca7b867a31a646265103
Author: Luca Bruno <lucabru src gnome org>
Date: Wed Jun 22 09:10:20 2011 +0200
codegen: Fix warning about copying delegate parameters in async method
codegen/valagasyncmodule.vala | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/codegen/valagasyncmodule.vala b/codegen/valagasyncmodule.vala
index df8184a..80c284e 100644
--- a/codegen/valagasyncmodule.vala
+++ b/codegen/valagasyncmodule.vala
@@ -42,6 +42,8 @@ public class Vala.GAsyncModule : GSignalModule {
}
foreach (Parameter param in m.get_parameters ()) {
+ bool is_unowned_delegate = param.variable_type is DelegateType && !param.variable_type.value_owned;
+
var param_type = param.variable_type.copy ();
param_type.value_owned = true;
data.add_field (param_type.get_cname (), get_variable_cname (param.name));
@@ -57,7 +59,9 @@ public class Vala.GAsyncModule : GSignalModule {
var deleg_type = (DelegateType) param.variable_type;
if (deleg_type.delegate_symbol.has_target) {
data.add_field ("gpointer", get_delegate_target_cname (get_variable_cname (param.name)));
- data.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (get_variable_cname (param.name)));
+ if (!is_unowned_delegate) {
+ data.add_field ("GDestroyNotify", get_delegate_target_destroy_notify_cname (get_variable_cname (param.name)));
+ }
}
}
}
@@ -244,6 +248,8 @@ public class Vala.GAsyncModule : GSignalModule {
foreach (Parameter param in m.get_parameters ()) {
if (param.direction != ParameterDirection.OUT) {
+ bool is_unowned_delegate = param.variable_type is DelegateType && !param.variable_type.value_owned;
+
var param_type = param.variable_type.copy ();
param_type.value_owned = true;
@@ -251,7 +257,7 @@ public class Vala.GAsyncModule : GSignalModule {
var old_captured = param.captured;
param.captured = false;
var value = load_parameter (param);
- if (requires_copy (param_type) && !param.variable_type.value_owned) {
+ if (requires_copy (param_type) && !param.variable_type.value_owned && !is_unowned_delegate) {
value = copy_value (value, param);
}
param.captured = old_captured;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]