diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-16 17:53:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-16 17:53:46 +0000 |
| commit | 6182b330f2bdf82d5cbfef65328b03f48985b7ae (patch) | |
| tree | 2cc67d3e2fe2194e4c25a5c0be460ffeb7761f1d /libutils/String8.cpp | |
| parent | c367736461c53afde71ae3e697d0fb0c0064e4bd (diff) | |
| parent | 906a03fc499455b6b14c7563ab2bd7c3454b1d06 (diff) | |
Merge "Remove move dead code." am: acec0918e5 am: 1fc404900c am: 906a03fc49
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1677028
Change-Id: I7fb50216bcf983584f664a691321683dd79ae38d
Diffstat (limited to 'libutils/String8.cpp')
| -rw-r--r-- | libutils/String8.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libutils/String8.cpp b/libutils/String8.cpp index ac3208e47..df160445e 100644 --- a/libutils/String8.cpp +++ b/libutils/String8.cpp @@ -25,6 +25,8 @@ #include <ctype.h> +#include <string> + #include "SharedBuffer.h" /* @@ -163,9 +165,7 @@ String8::String8(const char16_t* o, size_t len) } String8::String8(const char32_t* o) - : mString(allocFromUTF32(o, strlen32(o))) -{ -} + : mString(allocFromUTF32(o, std::char_traits<char32_t>::length(o))) {} String8::String8(const char32_t* o, size_t len) : mString(allocFromUTF32(o, len)) |