Fix for SBCL >= 0.9.8

[clg] / glib / proxy.lisp

diff --git a/glib/proxy.lisp b/glib/proxy.lisp
index 2f0bf75951bf055151894ba28b1247b6ea91d560..0baa3dc835babbb3ec28b57528a5c35d79f6a659 100644 (file)
--- 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.
 
 ;; 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.33 2006/02/15 09:45:41 espen Exp $
+;; $Id: proxy.lisp,v 1.34 2006/02/19 19:10:33 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -205,6 +205,10 @@ (defmethod compute-effective-slot-definition-initargs ((class virtual-slots-clas
        (let ((boundp (most-specific-slot-value direct-slotds 'boundp)))
         (unless (eq boundp *unbound-marker*)
           (setf (getf initargs :boundp) boundp)))
        (let ((boundp (most-specific-slot-value direct-slotds 'boundp)))
         (unless (eq boundp *unbound-marker*)
           (setf (getf initargs :boundp) boundp)))

+       ;; Need this to prevent type expansion in SBCL >= 0.9.8
+       (let ((type (most-specific-slot-value direct-slotds 'type)))
+        (unless (eq type *unbound-marker*)
+          (setf (getf initargs :type) type)))

        (nconc initargs (call-next-method))))
     (direct-special-slot-definition
      (append '(:special t) (call-next-method)))
        (nconc initargs (call-next-method))))
     (direct-special-slot-definition
      (append '(:special t) (call-next-method)))