From 58ed74395e06d538219f88da13268408be35f8f8 Mon Sep 17 00:00:00 2001 Message-Id: <58ed74395e06d538219f88da13268408be35f8f8.1714905380.git.mdw@distorted.org.uk> From: Mark Wooding Date: Fri, 3 Mar 2006 10:01:47 +0000 Subject: [PATCH] Added missing type method and bug fixes Organization: Straylight/Edgeware From: espen --- glib/proxy.lisp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/glib/proxy.lisp b/glib/proxy.lisp index 36fbb58..bd74e77 100644 --- a/glib/proxy.lisp +++ b/glib/proxy.lisp @@ -20,7 +20,7 @@ ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -;; $Id: proxy.lisp,v 1.37 2006-02-26 16:12:25 espen Exp $ +;; $Id: proxy.lisp,v 1.38 2006-03-03 10:01:47 espen Exp $ (in-package "GLIB") @@ -674,19 +674,25 @@ (defmethod unreference-foreign ((class static-struct-class) location) (deftype inlined (type) type) (define-type-method size-of ((type inlined)) - (let ((class (type-expand (second type)))) + (let ((class (second (type-expand-to 'inlined type)))) (foreign-size class))) (define-type-method reader-function ((type inlined)) - (let ((class (type-expand (second type)))) + (let ((class (second (type-expand-to 'inlined type)))) #'(lambda (location &optional (offset 0) weak-p) (declare (ignore weak-p)) (ensure-proxy-instance class (reference-foreign class (sap+ location offset)))))) (define-type-method writer-function ((type inlined)) - (let ((class (type-expand (second type)))) + (let ((class (second (type-expand-to 'inlined type)))) #'(lambda (instance location &optional (offset 0)) (copy-memory (foreign-location instance) (foreign-size class) (sap+ location offset))))) +(define-type-method destroy-function ((type inlined)) + (declare (ignore type)) + #'(lambda (location &optional offset) + (declare (ignore location offset)))) + + (export 'inlined) -- [mdw]