Commit 6297f7c7 authored by Liam M. Healy's avatar Liam M. Healy
Browse files

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*.
parent 25a3f7ce
;; Load GSL ;; Load GSL
;; Liam Healy Sat Mar 4 2006 - 18:53 ;; 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 ;; Copyright 2006, 2007, 2008, 2009, 2010, 2011 Liam M. Healy
;; Distributed under the terms of the GNU General Public License ;; Distributed under the terms of the GNU General Public License
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
;; antik:knots means "nautical miles per hour" vs. function #'gsl:knots ;; antik:knots means "nautical miles per hour" vs. function #'gsl:knots
;; antik:acceleration refers to the time derivative of velocity vs. object 'gsl:acceleration. ;; antik:acceleration refers to the time derivative of velocity vs. object 'gsl:acceleration.
;; si units symbol-macro vs. GSLL's sine integral. ;; 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 (setf
antik::*antik-user-shadow-symbols* antik::*antik-user-shadow-symbols*
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
iterate:multiply ; GSLL function duplicates '* iterate:multiply ; GSLL function duplicates '*
antik:polar-to-rectangular ; GSLL's doesn't use vectors antik:polar-to-rectangular ; GSLL's doesn't use vectors
antik:rectangular-to-polar ; GSLL's doesn't use vectors antik:rectangular-to-polar ; GSLL's doesn't use vectors
antik:acceleration
;; taken from GSLL ;; taken from GSLL
gsll::iterate ; conflict with iterate:iterate, but iterate:iter is a synonym gsll::iterate ; conflict with iterate:iterate, but iterate:iter is a synonym
)) ))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment