From: William Harold Newman <william.newman@airmail.net>
Date: Thu, 3 Oct 2002 19:04:36 +0000 (+0000)
Subject: 0.7.8.15:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9d907d32cec5750eac109d7d06fc5981911866f7;p=sbcl.git

0.7.8.15:
	merged NJF sb-pcl::check-wrapper-validity cleanup (sbcl-devel
		2002-10-02)
---

diff --git a/src/code/typep.lisp b/src/code/typep.lisp
index 19ac49a..6807198 100644
--- a/src/code/typep.lisp
+++ b/src/code/typep.lisp
@@ -196,7 +196,7 @@
   (declare (optimize speed))
   (when (layout-invalid obj-layout)
     (if (and (typep (sb!xc:class-of object) 'sb!xc:standard-class) object)
-	(setq obj-layout (pcl-check-wrapper-validity-hook object))
+	(setq obj-layout (sb!pcl::check-wrapper-validity object))
 	(error "TYPEP was called on an obsolete object (was class ~S)."
 	       (class-proper-name (layout-class obj-layout)))))
   (let ((layout (class-layout class))
@@ -208,8 +208,7 @@
 	  (when (eq (svref obj-inherits i) layout)
 	    (return t))))))
 
-;;; to be redefined as PCL::CHECK-WRAPPER-VALIDITY when PCL is loaded
-;;;
-;;; FIXME: should probably be renamed SB!PCL:CHECK-WRAPPER-VALIDITY
-(defun pcl-check-wrapper-validity-hook (object)
+;;; This implementation is a placeholder to use until PCL is set up,
+;;; at which time it will be overwritten by a real implementation.
+(defun sb!pcl::check-wrapper-validity (object)
   object)
diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 1c9b4fe..c3b30b2 100644
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -78,15 +78,6 @@ bootstrapping.
 ;;; then things break.)
 (declaim (declaration class))
 
-;;; FIXME: SB-KERNEL::PCL-CHECK-WRAPPER-VALIDITY-HOOK shouldn't be a
-;;; separate function. Instead, we should define a simple placeholder
-;;; version of SB-PCL:CHECK-WRAPPER-VALIDITY where
-;;; SB-KERNEL::PCL-CHECK-WRAPPER-VALIDITY is defined now, then just
-;;; let the later real PCL DEFUN of SB-PCL:CHECK-WRAPPER-VALIDITY
-;;; overwrite it.
-(setf (symbol-function 'sb-kernel::pcl-check-wrapper-validity-hook)
-      #'check-wrapper-validity)
-
 (declaim (notinline make-a-method
 		    add-named-method
 		    ensure-generic-function-using-class
diff --git a/version.lisp-expr b/version.lisp-expr
index 0dd0386..6467974 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -18,4 +18,4 @@
 ;;; internal versions off the main CVS branch, it gets hairier, e.g.
 ;;; "0.pre7.14.flaky4.13".)
 
-"0.7.8.14"
+"0.7.8.15"