Commit f4213537 authored by Liam M. Healy's avatar Liam M. Healy

Name conditions generic-failure-* differently

Name conditions generic-failure-1 and generic-failure-2 because CCL
doesn't like the duplicate differently.  Withdraw the
conditionalization away of +nan+, +positive-infinity+, and
+negative-infinity+ for CCL because the latest version
"Version 1.6-dev-r13994M-trunk  (LinuxX8664)"
can handle them.
parent 53f3c09f
;; GSL errors
;; Liam Healy Sat Mar 4 2006 - 18:33
;; Time-stamp: <2009-12-27 09:50:32EST conditions.lisp>
;; Time-stamp: <2010-07-20 17:55:56EDT conditions.lisp>
;;
;; Copyright 2006, 2007, 2008, 2009 Liam M. Healy
;; Distributed under the terms of the GNU General Public License
......@@ -85,8 +85,8 @@
(define-gsl-condition input-range +erange+ "Output range error")
(define-gsl-condition invalid-pointer +efault+ "Invalid pointer")
(define-gsl-condition invalid-argument +einval+ "Invalid argument")
(define-gsl-condition generic-failure +efailed+ "Generic failure")
(define-gsl-condition generic-failure +failure+ "Generic failure")
(define-gsl-condition generic-failure-1 +efailed+ "Generic failure")
(define-gsl-condition generic-failure-2 +failure+ "Generic failure")
(define-gsl-condition factorization-failure +efactor+ "Factorization failed")
(define-gsl-condition sanity-check-failure
+esanity+ "Sanity check failed - shouldn't happen")
......
;; Mathematical functions
;; Liam Healy, Wed Mar 8 2006 - 22:09
;; Time-stamp: <2010-07-19 12:33:44EDT mathematical.lisp>
;; Time-stamp: <2010-07-20 16:56:44EDT mathematical.lisp>
;;
;; Copyright 2006, 2007, 2008, 2009, 2010 Liam M. Healy
;; Distributed under the terms of the GNU General Public License
......@@ -53,19 +53,14 @@
(map-name '+negative-infinity+ "gsl_neginf")
(map-name '+nan+ "gsl_nan")
;; CCL gives a bizarre error when trying to compile these, even though
;; loading them works fine.
#-ccl
(defconstant +nan+
(ignore-errors
(cffi:foreign-funcall "gsl_nan" :double)))
#-ccl
(defconstant +positive-infinity+
(ignore-errors
(cffi:foreign-funcall "gsl_posinf" :double)))
#-ccl
(defconstant +negative-infinity+
(ignore-errors
(cffi:foreign-funcall "gsl_neginf" :double)))
......
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