From a64ce6ead2cd11dfd2b71c9d2f85b4cdc919a5a9 Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Mon, 20 Jan 2020 12:28:24 +0100 Subject: [PATCH] Avoid G_VARIANT_TYPE in generated code We never want to verify the type strings, as these are never wrong for generated code. --- variant-schema-compiler | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/variant-schema-compiler b/variant-schema-compiler index f6f68666..d3ade0b9 100755 --- a/variant-schema-compiler +++ b/variant-schema-compiler @@ -541,7 +541,7 @@ class Type: /************** {TypeName} *******************/ #define {TYPE_NAME_}TYPESTRING "{typestring}" -#define {TYPE_NAME_}TYPEFORMAT G_VARIANT_TYPE ({TYPE_NAME_}TYPESTRING) +#define {TYPE_NAME_}TYPEFORMAT ((const GVariantType *) {TYPE_NAME_}TYPESTRING) typedef struct {{ gconstpointer base; @@ -896,7 +896,7 @@ class DictType(Type): return [self.key_type, self.value_type] def add_expansion_vars(self, vars): vars['element_fixed_size'] = self.element_fixed_size() - vars['element_typeformat'] = 'G_VARIANT_TYPE("' + self.typestring()[1:] + '")' + vars['element_typeformat'] = '((const GVariantType *) "' + self.typestring()[1:] + '")' vars['value_ctype'] = self.value_type.get_ctype() vars['value_typename'] = self.value_type.typename vars['value_fixed_size'] = self.value_type.get_fixed_size()