commit | aaa920d7969d9dd4b9e7871f2758d9092095bead | [log] [tgz] |
---|---|---|
author | Dan Albert <danalbert@google.com> | Sun Nov 09 02:09:35 2014 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Sun Nov 09 02:09:35 2014 +0000 |
tree | 5a4a0c027a9c0ccd0270cecec6fc7c5057e1673d | |
parent | 855074043144e74156972e7a3416808dc6696452 [diff] | |
parent | 2f5ad5ff8623604ac2e7fa0b704287511acea1e2 [diff] |
Merge "Make Unicode.h use types that match libc++."
diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h index 5b98de2..aaf951b 100644 --- a/include/utils/Unicode.h +++ b/include/utils/Unicode.h
@@ -24,8 +24,8 @@ // Definitions exist in C++11 #if defined __cplusplus && __cplusplus < 201103L -typedef uint32_t char32_t; -typedef uint16_t char16_t; +typedef unsigned int char32_t; +typedef unsigned short char16_t; #endif // Standard string functions on char16_t strings.