From 6297f7c72202c227637e2d49967c84a1c9ecdd5d Mon Sep 17 00:00:00 2001
From: "Liam M. Healy" <lhealy@common-lisp.net>
Date: Fri, 19 Aug 2011 23:40:32 -0400
Subject: [PATCH] Change shadowing of 'acceleration

CCL gets a conflict between the type antik:acceleration and the class
gsll:acceleration, so remove the symbol from the shadowing list of
GSLL and add it to antik::*antik-user-shadow-symbols*.
---
 init/init.lisp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/init/init.lisp b/init/init.lisp
index 7cde22dc..41ef370a 100644
--- a/init/init.lisp
+++ b/init/init.lisp
@@ -1,6 +1,6 @@
 ;; Load GSL
 ;; Liam Healy Sat Mar  4 2006 - 18:53
-;; Time-stamp: <2011-01-13 09:38:45EST init.lisp>
+;; Time-stamp: <2011-08-19 23:29:56EDT init.lisp>
 ;;
 ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
 ;; Distributed under the terms of the GNU General Public License
@@ -28,7 +28,7 @@
   ;; antik:knots means "nautical miles per hour" vs. function #'gsl:knots
   ;; antik:acceleration refers to the time derivative of velocity vs. object 'gsl:acceleration.
   ;; si units symbol-macro vs. GSLL's sine integral.
-  (:shadowing-import-from :antik #:psi #:knots #:acceleration #:si))
+  (:shadowing-import-from :antik #:psi #:knots #:si))
 
 (setf
  antik::*antik-user-shadow-symbols*
@@ -42,6 +42,7 @@
 	   iterate:multiply		; GSLL function duplicates '*
 	   antik:polar-to-rectangular	; GSLL's doesn't use vectors
 	   antik:rectangular-to-polar	; GSLL's doesn't use vectors
+	   antik:acceleration
 	   ;; taken from GSLL
 	   gsll::iterate ; conflict with iterate:iterate, but iterate:iter is a synonym
 	   ))
-- 
GitLab