diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-20 11:54:39 -0800 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-11-20 11:54:39 -0800 |
| commit | c59932f937beddaa911cd8b9d186647a797fd4c2 (patch) | |
| tree | 2860d44591bf827433c004c368df9d517c7e2b3d /include | |
| parent | 606bb5f2e5f2913d5cb30ed87dd18da23dda1705 (diff) | |
| download | system_core-c59932f937beddaa911cd8b9d186647a797fd4c2.zip system_core-c59932f937beddaa911cd8b9d186647a797fd4c2.tar.gz system_core-c59932f937beddaa911cd8b9d186647a797fd4c2.tar.bz2 | |
Remove incompatible Unicode compatibility types.
As well intentioned as these were, uint16_t and C++11's char16_t are
_not_ actually compatible. They are not implicitly convertible, and
they mangle differently, so they are not even ABI compatible. In our
now wonderous world of C++11, no one should be using these, so just
kill them.
Bug: 18300613
Change-Id: I06d92d7f1d937dd94a620874323d4c50eb6a31bd
Diffstat (limited to 'include')
| -rw-r--r-- | include/utils/Unicode.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/utils/Unicode.h b/include/utils/Unicode.h index aaf951b..b76a5e2 100644 --- a/include/utils/Unicode.h +++ b/include/utils/Unicode.h @@ -22,12 +22,6 @@ extern "C" { -// Definitions exist in C++11 -#if defined __cplusplus && __cplusplus < 201103L -typedef unsigned int char32_t; -typedef unsigned short char16_t; -#endif - // Standard string functions on char16_t strings. int strcmp16(const char16_t *, const char16_t *); int strncmp16(const char16_t *s1, const char16_t *s2, size_t n); |