From 19ca64163f6293778dec9f2bede0e77cab776bd7 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 5 Apr 2010 12:17:46 +0800 Subject: [PATCH] sync changes --- giscanner/transformer.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 3533002..5836c33 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -350,38 +350,24 @@ class Transformer(object): value = 'void' elif source_type.type == CTYPE_BASIC_TYPE: value = source_type.name -<<<<<<< HEAD -<<<<<<< HEAD # skip adding invalid types. -======= # share the const down the tree.. ->>>>>>> 0abc74b... [TYPEDEF] revert change that broke build if not source_type.base_type: return value value_add = self._create_source_type(source_type.base_type) if len(value_add): value += ' ' + value_add -======= - if source_type.base_type: - value += ' ' + self._create_source_type(source_type.base_type) ->>>>>>> f2cc056... [TYPEDEF] transformer.py - revert last bad fix elif source_type.type == CTYPE_TYPEDEF: value = source_type.name elif source_type.type == CTYPE_ARRAY: return self._create_source_type(source_type.base_type) elif source_type.type == CTYPE_POINTER: value = self._create_source_type(source_type.base_type) + '*' -<<<<<<< HEAD -<<<<<<< HEAD -======= elif source_type.type == CTYPE_STRUCT: value = source_type.name ->>>>>>> 0abc74b... [TYPEDEF] revert change that broke build elif source_type.type == CTYPE_INVALID: #this happens if const is after the type.. value = '' -======= ->>>>>>> f2cc056... [TYPEDEF] transformer.py - revert last bad fix else: value = 'any' return value -- 2.39.2