CMUCL commit: RELEASE-20B-BRANCH src/pcl/simple-streams/external-formats (2 files)

[Raymond Toy]

    Date: Sunday, August 15, 2010 @ 08:45:57
  Author: rtoy
    Path: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats
     Tag: RELEASE-20B-BRANCH

Modified: iso8859-1.lisp iso8859-2.lisp

Merge fixes from trunk to silence some compiler notes.


----------------+
 iso8859-1.lisp |    9 ++++++---
 iso8859-2.lisp |    8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)


Index: src/pcl/simple-streams/external-formats/iso8859-1.lisp
diff -u src/pcl/simple-streams/external-formats/iso8859-1.lisp:1.6 src/pcl/simple-streams/external-formats/iso8859-1.lisp:1.6.4.1
--- src/pcl/simple-streams/external-formats/iso8859-1.lisp:1.6	Mon Jul 12 10:42:11 2010
+++ src/pcl/simple-streams/external-formats/iso8859-1.lisp	Sun Aug 15 08:45:56 2010
@@ -4,7 +4,7 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/iso8859-1.lisp,v 1.6 2010-07-12 14:42:11 rtoy Exp $")
+(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/iso8859-1.lisp,v 1.6.4.1 2010-08-15 12:45:56 rtoy Exp $")
 
 (in-package "STREAM")
 (intl:textdomain "cmucl")
@@ -25,7 +25,10 @@
   (code-to-octets (code state output error)
     `(,output (if (> ,code 255)
 		  (if ,error
-		      (funcall ,error "Cannot output codepoint #x~X to ISO8859-1 stream"
-			       ,code 1)
+		   (locally
+		       ;; No warnings about fdefinition
+		       (declare (optimize (ext:inhibit-warnings 3)))
+		     (funcall ,error "Cannot output codepoint #x~X to ISO8859-1 stream"
+			      ,code 1))
 		      #x3F)
 		  ,code))))
Index: src/pcl/simple-streams/external-formats/iso8859-2.lisp
diff -u src/pcl/simple-streams/external-formats/iso8859-2.lisp:1.7 src/pcl/simple-streams/external-formats/iso8859-2.lisp:1.7.4.1
--- src/pcl/simple-streams/external-formats/iso8859-2.lisp:1.7	Mon Jul 12 10:42:11 2010
+++ src/pcl/simple-streams/external-formats/iso8859-2.lisp	Sun Aug 15 08:45:56 2010
@@ -4,7 +4,7 @@
 ;;; This code was written by Paul Foley and has been placed in the public
 ;;; domain.
 ;;;
-(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/iso8859-2.lisp,v 1.7 2010-07-12 14:42:11 rtoy Exp $")
+(ext:file-comment "$Header: /project/cmucl/cvsroot/src/pcl/simple-streams/external-formats/iso8859-2.lisp,v 1.7.4.1 2010-08-15 12:45:56 rtoy Exp $")
 
 (in-package "STREAM")
 (intl:textdomain "cmucl")
@@ -42,5 +42,9 @@
 		    (if ,code
 			(+ (the (unsigned-byte 7) ,present) 160)
 			(if ,error
-			    (funcall ,error "Cannot output codepoint #x~X to ISO8859-2 stream" ,code)
+			    (locally
+				;; No warnings about fdefinition
+				(declare (optimize (ext:inhibit-warnings 3)))
+			      (funcall ,error "Cannot output codepoint #x~X to ISO8859-2 stream"
+				       ,code))
 			    #x3F)))))))