Updates for SBCL 0.9.14 and 0.9.15

[clg] / gffi / proxy.lisp

diff --git a/gffi/proxy.lisp b/gffi/proxy.lisp
index b7cdaedd4e637f77941f52ff9240e3d06a0a4e8b..c2c3fbccec91a10150b076a7afc3e9858b1049eb 100644 (file)
--- a/gffi/proxy.lisp
+++ b/gffi/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.
 
 ;; 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.2 2006-06-08 13:25:09 espen Exp $
+;; $Id: proxy.lisp,v 1.3 2006-08-16 11:02:45 espen Exp $

 
 (in-package "GFFI")
 
 
 (in-package "GFFI")
 


@@ -162,7 +162,7 @@ (defmethod invalidate-instance ((instance proxy) &optional finalize-p)
       (funcall (instance-finalizer instance)))
     (slot-makunbound instance 'location)
     (cancel-finalization instance))
       (funcall (instance-finalizer instance)))
     (slot-makunbound instance 'location)
     (cancel-finalization instance))

-  ;; We can't cached invalidated instances in CLISP beacuse it is
+  ;; We can't cache invalidated instances in CLISP beacuse it is

   ;; not possible to cancel finalization
   #-clisp(cache-invalidated-instance instance))
 
   ;; not possible to cancel finalization
   #-clisp(cache-invalidated-instance instance))
 


@@ -242,7 +242,8 @@   (defmethod compute-effective-slot-definition-initargs ((class proxy-class) dir
       (call-next-method)))
   
 
       (call-next-method)))
   
 

-  (defmethod compute-slot-reader-function ((slotd effective-alien-slot-definition))
+  (defmethod compute-slot-reader-function ((slotd effective-alien-slot-definition) &optional signal-unbound-p)
+    (declare (ignore signal-unbound-p))

     (let* ((type (slot-definition-type slotd))
           (offset (slot-definition-offset slotd))
           (reader (reader-function type)))
     (let* ((type (slot-definition-type slotd))
           (offset (slot-definition-offset slotd))
           (reader (reader-function type)))


@@ -260,7 +261,8 @@   (defmethod compute-slot-writer-function ((slotd effective-alien-slot-definitio
            (funcall writer value location offset))
          value)))
   
            (funcall writer value location offset))
          value)))
   

-  (defmethod compute-slot-reader-function ((slotd effective-virtual-alien-slot-definition))
+  (defmethod compute-slot-reader-function ((slotd effective-virtual-alien-slot-definition) &optional signal-unbound-p)
+    (declare (ignore signal-unbound-p))

     (if (and (slot-boundp slotd 'getter) (stringp (slot-definition-getter slotd)))
        (let ((getter (slot-definition-getter slotd))
              (type (slot-definition-type slotd))
     (if (and (slot-boundp slotd 'getter) (stringp (slot-definition-getter slotd)))
        (let ((getter (slot-definition-getter slotd))
              (type (slot-definition-type slotd))