[llvm-branch-commits] [libcxx] r369898 - Merging r369364:

[Hans Wennborg via llvm-branch-commits]

Author: hans
Date: Mon Aug 26 05:21:33 2019
New Revision: 369898

URL: http://llvm.org/viewvc/llvm-project?rev=369898&view=rev
Log:
Merging r369364:
------------------------------------------------------------------------
r369364 | miyuki | 2019-08-20 12:19:55 +0200 (Tue, 20 Aug 2019) | 6 lines

[libcxx] Fix build breakage on mips

Fixes https://bugs.llvm.org/show_bug.cgi?id=43011 caused by
https://reviews.llvm.org/D63284.

Committing as obvious.
------------------------------------------------------------------------

Modified:
    libcxx/branches/release_90/   (props changed)
    libcxx/branches/release_90/include/__locale

Propchange: libcxx/branches/release_90/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 26 05:21:33 2019
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:366868,368867,368916,369399,369537
+/libcxx/trunk:366868,368867,368916,369364,369399,369537

Modified: libcxx/branches/release_90/include/__locale
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_90/include/__locale?rev=369898&r1=369897&r2=369898&view=diff
==============================================================================
--- libcxx/branches/release_90/include/__locale (original)
+++ libcxx/branches/release_90/include/__locale Mon Aug 26 05:21:33 2019
@@ -409,7 +409,7 @@ public:
     static const mask xdigit = _ISxdigit;
     static const mask blank  = _ISblank;
 #if defined(__mips__)
-    static const mask __regex_word = static_cast<char_class_type>(_ISbit(15));
+    static const mask __regex_word = static_cast<mask>(_ISbit(15));
 #else
     static const mask __regex_word = 0x80;
 #endif