r4457: Auto commit for Debian build

diff --git a/debian/changelog b/debian/changelog
index 48075985bb3450c00c9676274792bbce1f50f49f..f55084c6573ba5e40fa8ad5170f7a90a2f284485 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-hyperobject (2.6.1-1) unstable; urgency=low
+
+  * New upstream
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Sat, 12 Apr 2003 08:26:49 -0600
+
 cl-hyperobject (2.6.0-1) unstable; urgency=low
 
   * Encapsulate differences in class-slot order since sbcl/cmucl

diff --git a/mop.lisp b/mop.lisp
index c3a91520c65d41a169e0e79a9d40f70d80670303..01d1bc789f8faa13d371e449a3b662dd61a21f0c 100644 (file)
--- a/mop.lisp
+++ b/mop.lisp
@@ -11,7 +11,7 @@
 ;;;; in Text, HTML, and XML formats. This includes hyperlinking
 ;;;; capability and sub-objects.
 ;;;;
-;;;; $Id: mop.lisp,v 1.47 2003/04/12 05:40:47 kevin Exp $
+;;;; $Id: mop.lisp,v 1.48 2003/04/12 14:31:52 kevin Exp $
 ;;;;
 ;;;; This file is Copyright (c) 2000-2002 by Kevin M. Rosenberg
 ;;;;
@@ -191,33 +191,8 @@
     (t
      t)))
 
-#+(or sbcl cmu scl)
-(defmethod compute-effective-slot-definition :around ((cl hyperobject-class) dsds)
-  (let* ((dsd (car dsds))
-        (value-type (canonicalize-value-type (slot-value dsd 'value-type))))
-    (multiple-value-bind (sql-type length) (value-type-to-sql-type value-type)
-      (setf (slot-value dsd 'sql-type) sql-type)
-      (setf (slot-value dsd 'type) (value-type-to-lisp-type value-type))
-      (let ((ia (compute-effective-slot-definition-initargs
-                cl #+lispworks name dsds)))
-       (apply
-        #'make-instance 'hyperobject-esd 
-        :value-type value-type
-        :sql-type sql-type
-        :length length
-        :print-formatter (slot-value dsd 'print-formatter)
-        :subobject (slot-value dsd 'subobject)
-        :hyperlink (slot-value dsd 'hyperlink)
-        :hyperlink-parameters (slot-value dsd 'hyperlink-parameters)
-        :description (slot-value dsd 'description)
-        :user-name (slot-value dsd 'user-name)
-        :index (slot-value dsd 'index)
-        :value-constraint (slot-value dsd 'value-constraint)
-        :null-allowed (slot-value dsd 'null-allowed)
-        ia)))))
-
 (defmethod compute-effective-slot-definition :around ((cl hyperobject-class)
-                                                     #+(or lispworks allegro) name
+                                                     #-(or cmu scl) name
                                                      dsds)
   #+allegro (declare (ignore name))
   (let* ((dsd (car dsds))