aboutsummaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authorFrançois-Xavier Coudert <fxcoudert@gcc.gnu.org>2010-06-10 09:16:08 +0000
committerFrançois-Xavier Coudert <fxcoudert@gcc.gnu.org>2010-06-10 09:16:08 +0000
commitcefab2e4825e2e5dd8bfdf79ed78372ec6462f1e (patch)
tree56b31878cadc82b98b563f8fefcec525b7876ab3 /libgfortran
parentacaed831f6cc09ef9d7661ce7a4532a7e0d72db7 (diff)
downloadgcc-cefab2e4825e2e5dd8bfdf79ed78372ec6462f1e.zip
gcc-cefab2e4825e2e5dd8bfdf79ed78372ec6462f1e.tar.gz
gcc-cefab2e4825e2e5dd8bfdf79ed78372ec6462f1e.tar.bz2
selected_char_kind.c (selected_char_kind): Fix return value for ISO_10646.
* intrinsics/selected_char_kind.c (selected_char_kind): Fix return value for ISO_10646. * gfortran.dg/selected_char_kind_4.f90: New test. From-SVN: r160527
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog55
-rw-r--r--libgfortran/intrinsics/selected_char_kind.c2
2 files changed, 31 insertions, 26 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index f71567d..946168c 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-10 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
+
+ * intrinsics/selected_char_kind.c (selected_char_kind): Fix
+ return value for ISO_10646.
+
2010-06-09 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
* mk-kinds-h.sh: Define GFC_REAL_*_LITERAL_SUFFIX and
@@ -43,31 +48,31 @@
2010-05-07 Janne Blomqvist <jb@gcc.gnu.org>
- * libgfortran.h (free_mem): Remove prototype.
- * runtime/memory.c (free_mem): Remove function.
- * intrinsics/date_and_time.c (secnds): Replace free_mem() with
- free().
- * io/fbuf.c (fbuf_destroy): Likewise.
- * io/format.c (free_format_hash_table): Likewise.
- (save_parsed_format): Likewise.
- (free_format_data): Likewise.
- * io/list_read.c (free_saved): Likewise.
- (free_line): Likewise.
- (nml_touch_nodes): Likewise.
- (nml_read_obj): Likewise
- * io/lock.c (free_ionml): Likewise.
- * io/open.c (new_unit): Likewise.
- (already_open): Likewise.
- * io/unit.c (destroy_unit_mutex): Likewise.
- (free_internal_unit): Likewise.
- (close_unit_1): Likewise.
- * io/unix.c (raw_close): Likewise.
- (buf_close): Likewise.
- (mem_close): Likewise.
- (tempfile): Likewise.
- * io/write.c (nml_write_obj): Likewise.
- * io/write_float.def (output_float_FMT_G_##): Likewise.
- * runtime/error.c (show_locus): Likewise.
+ * libgfortran.h (free_mem): Remove prototype.
+ * runtime/memory.c (free_mem): Remove function.
+ * intrinsics/date_and_time.c (secnds): Replace free_mem() with
+ free().
+ * io/fbuf.c (fbuf_destroy): Likewise.
+ * io/format.c (free_format_hash_table): Likewise.
+ (save_parsed_format): Likewise.
+ (free_format_data): Likewise.
+ * io/list_read.c (free_saved): Likewise.
+ (free_line): Likewise.
+ (nml_touch_nodes): Likewise.
+ (nml_read_obj): Likewise
+ * io/lock.c (free_ionml): Likewise.
+ * io/open.c (new_unit): Likewise.
+ (already_open): Likewise.
+ * io/unit.c (destroy_unit_mutex): Likewise.
+ (free_internal_unit): Likewise.
+ (close_unit_1): Likewise.
+ * io/unix.c (raw_close): Likewise.
+ (buf_close): Likewise.
+ (mem_close): Likewise.
+ (tempfile): Likewise.
+ * io/write.c (nml_write_obj): Likewise.
+ * io/write_float.def (output_float_FMT_G_##): Likewise.
+ * runtime/error.c (show_locus): Likewise.
2010-05-04 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
diff --git a/libgfortran/intrinsics/selected_char_kind.c b/libgfortran/intrinsics/selected_char_kind.c
index 35cf453..2525997 100644
--- a/libgfortran/intrinsics/selected_char_kind.c
+++ b/libgfortran/intrinsics/selected_char_kind.c
@@ -40,7 +40,7 @@ selected_char_kind (gfc_charlen_type name_len, char *name)
|| (len == 7 && strncasecmp (name, "default", 7) == 0))
return 1;
else if (len == 9 && strncasecmp (name, "iso_10646", 9) == 0)
- return 1;
+ return 4;
else
return -1;
}