summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-26 06:43:36 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-26 06:43:36 +0000
commit76b33197e245c5ad070a3da427f096a82fccf898 (patch)
treec7c262a04df2d7025bc3c20902b9e87a912d2f1a
parent3642494ce5a44938285677669b3e001a1af1ce47 (diff)
* ext/json/generator/generator.c (convert_UTF8_to_JSON_ASCII): get rid
of a warning. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/json/generator/generator.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6b35175e08..c9e7789f01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 26 15:42:59 2010 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/json/generator/generator.c (convert_UTF8_to_JSON_ASCII): get rid
+ of a warning.
+
Mon Apr 26 13:11:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (ripper_get_value): escape Qundef.
diff --git a/ext/json/generator/generator.c b/ext/json/generator/generator.c
index 3d3620534b..043be606cb 100644
--- a/ext/json/generator/generator.c
+++ b/ext/json/generator/generator.c
@@ -172,7 +172,7 @@ static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
fbuffer_append(buffer, "\\\"", 2);
break;
default:
- fbuffer_append_char(buffer, ch);
+ fbuffer_append_char(buffer, (char)ch);
break;
}
} else {