From c911493491ae78fceaebd00627ec177ff4b92540 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20R=20Sede=C3=B1o?= Date: Sun, 3 Mar 2013 00:08:39 -0500 Subject: [PATCH] pull in trivial-garbage for TG:MAKE-WEAK-HASH-TABLE --- cl-protobufs.asd | 2 +- define-proto.lisp | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/cl-protobufs.asd b/cl-protobufs.asd index 97b846b..7aaf3bf 100644 --- a/cl-protobufs.asd +++ b/cl-protobufs.asd @@ -19,7 +19,7 @@ :maintainer '("Scott McKay") :description "Protobufs for Common Lisp" :long-description "Protobufs for Common Lisp" - :depends-on (:closer-mop :babel) + :depends-on (:closer-mop :babel :trivial-garbage) :serial t :components ((:module "packages" diff --git a/define-proto.lisp b/define-proto.lisp index 9f6cca4..3e7e83c 100644 --- a/define-proto.lisp +++ b/define-proto.lisp @@ -408,8 +408,7 @@ (intern (format nil "~A-~A" 'set reader) *protobuf-package*))) (default (getf inits :initform))) (collect-form `(without-redefinition-warnings () - (let ((,stable #+ccl (make-hash-table :test #'eq :weak t) - #+sbcl (make-hash-table :test #'eq :weakness :value))) + (let ((,stable (tg:make-weak-hash-table :weakness :value :test #'eq))) ,@(and reader `((defmethod ,reader ((object ,type)) (gethash object ,stable ,default)))) ,@(and writer `((defmethod ,writer ((object ,type) value) @@ -463,8 +462,7 @@ ;; will result in harmless redefinitions, so squelch the warnings ;;--- Maybe these methods need to be defined in 'define-message'? (collect-form `(without-redefinition-warnings () - (let ((,stable #+ccl (make-hash-table :test #'eq :weak t) - #+sbcl (make-hash-table :test #'eq :weakness :value))) + (let ((,stable (tg:make-weak-hash-table :weakness :value :test #'eq))) ,@(and reader `((defmethod ,reader ((object ,type)) (gethash object ,stable ,default)))) ,@(and writer `((defmethod ,writer ((object ,type) value) -- 2.45.2