[elephant-cvs] CVS elephant/src/memutil

[ieslick]

Update of /project/elephant/cvsroot/elephant/src/memutil
In directory clnet:/tmp/cvs-serv9359/src/memutil

Modified Files:
	memutil.lisp 
Log Message:

Corrections for SBCL serialization and index testing.



--- /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp	2006/04/26 17:53:45	1.5
+++ /project/elephant/cvsroot/elephant/src/memutil/memutil.lisp	2006/04/26 21:41:24	1.6
@@ -56,10 +56,6 @@
 	   #:*c-library-extension*
 	   ))
 
-;; --REMOVE HACK--
-(defpackage elephant
-  (:use :cl))
-
 (in-package "ELEPHANT-MEMUTIL")
 
 #+cmu
@@ -332,8 +328,7 @@
      (string (excl:native-string-sizeof ,s :external-format :unicode)))
   #+(or (and sbcl sb-unicode) lispworks)
   `(etypecase ,s 
-    (base-string (* (length ,s) #+sbcl 4 #+lispworks 2) )
-		 ;;    (length ,s)))
+    (base-string (length ,s))
     (string (* (length ,s) #+sbcl 4 #+lispworks 2)))
   #-(or lispworks (and allegro ics) (and sbcl sb-unicode))
   `(length ,s))
@@ -592,6 +587,7 @@
     (incf (buffer-stream-position bs))
     (deref-array (buffer-stream-buffer bs) '(:array :unsigned-byte) position)))
 
+
 (defun buffer-read-byte-vector (bs)
    "Read the whole buffer into  byte vector."
    (declare (optimize (speed 3) (safety 0))