projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
17fdb0a
)
[flang] One more
author
peter klausler
<pklausler@nvidia.com>
Fri, 28 Jun 2019 18:43:57 +0000
(11:43 -0700)
committer
peter klausler
<pklausler@nvidia.com>
Fri, 28 Jun 2019 18:43:57 +0000
(11:43 -0700)
Original-commit: flang-compiler/f18@
8d73b44eae3dabdc68d8df5a4a97a8808ec7db25
Reviewed-on: https://github.com/flang-compiler/f18/pull/535
flang/lib/evaluate/type.cc
patch
|
blob
|
history
diff --git
a/flang/lib/evaluate/type.cc
b/flang/lib/evaluate/type.cc
index
025fb16
..
b3d47c8
100644
(file)
--- a/
flang/lib/evaluate/type.cc
+++ b/
flang/lib/evaluate/type.cc
@@
-234,9
+234,9
@@
int SelectedCharKind(const std::string &s) { // 16.9.168
}
if (lower == "ascii") {
return 1;
- } else if (lower == "
jis
") {
+ } else if (lower == "
ucs-2
") {
return 2;
- } else if (lower == "iso_10646") {
+ } else if (lower == "iso_10646"
|| lower == "ucs-4"
) {
return 4;
} else {
return -1;