[elephant-cvs] CVS update: elephant/src/elephant.lisp

[blee at common-lisp.net]

Update of /project/elephant/cvsroot/elephant/src
In directory common-lisp.net:/tmp/cvs-serv16598/src

Modified Files:
	elephant.lisp 
Log Message:
openmcl

Date: Thu Sep  2 09:10:34 2004
Author: blee

Index: elephant/src/elephant.lisp
diff -u elephant/src/elephant.lisp:1.7 elephant/src/elephant.lisp:1.8
--- elephant/src/elephant.lisp:1.7	Mon Aug 30 23:14:49 2004
+++ elephant/src/elephant.lisp	Thu Sep  2 09:10:34 2004
@@ -43,7 +43,6 @@
 (defpackage elephant
   (:nicknames ele :ele)
   (:use common-lisp sleepycat)
-  (:shadow #:with-transaction)
   (:export #:*store-controller* #:*current-transaction* #:*auto-commit*
 	   #:open-store #:close-store
 	   #:store-controller #:open-controller #:close-controller 
@@ -75,6 +74,7 @@
 		slot-value-using-class
 		slot-boundp-using-class
 		slot-definition-allocation
+		slot-definition-initargs
 		compute-slots
 
 		initialize-internal-slot-functions
@@ -105,6 +105,7 @@
 		slot-value-using-class
 		slot-boundp-using-class
 		slot-definition-allocation
+		slot-definition-initargs
 		compute-slots)                                
   #+sbcl
   (:import-from :sb-pcl
@@ -136,17 +137,55 @@
 		slot-value-using-class
 		slot-boundp-using-class
 		slot-definition-allocation
+		slot-definition-initargs
 		compute-slots)
   #+allegro
   (:import-from :excl
 		compute-effective-slot-definition-initargs)
-  #+openmcl 
-  (:import-from :openmcl-mop
+  #+openmcl
+  (:import-from :ccl
+		validate-superclass
+		standard-slot-definition
+		standard-direct-slot-definition
+		standard-effective-slot-definition
+		direct-slot-definition-class
+		effective-slot-definition-class
 		slot-definition-name
-		compute-slots)
+		slot-definition-initfunction
+		compute-effective-slot-definition
+		class-slots
+		slot-value-using-class
+		slot-boundp-using-class
+		slot-definition-allocation
+		slot-definition-initargs
+		compute-slots
+		;; This stuff we need until we resolve the :transient
+		;; slot specifier stuff
+		make-effective-slot-definition
+		slots-class
+		%slot-definition-initfunction
+		%slot-definition-documentation
+		%slot-definition-initargs
+		%slot-definition-initform
+		%slot-definition-allocation
+		%slot-definition-class
+		%slot-definition-type)
   #+lispworks  
   (:import-from :clos
+		validate-superclass
+		standard-slot-definition
+		standard-direct-slot-definition
+		standard-effective-slot-definition
+		direct-slot-definition-class
+		effective-slot-definition-class
 		slot-definition-name
+		slot-definition-initfunction
+		compute-effective-slot-definition
+		class-slots
+		slot-value-using-class
+		slot-boundp-using-class
+		slot-definition-allocation
+		slot-definition-initargs
 		compute-slots)
 
   )