diff options
author | Yi Kong <yikong@google.com> | 2018-07-17 10:06:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-07-17 10:06:10 -0700 |
commit | 2a6a58a818d5cc38cb624a6a4154a93166d01f18 (patch) | |
tree | a7a612b80717c9ed88e880fc9f160fa9b1b3ae25 /libutils/String16.cpp | |
parent | 6286088afee20c7c4cfe125cbddd3a13adc5fd15 (diff) | |
parent | ab3203f38363e7b5fadfe281ed8870be6044b674 (diff) |
Merge "[libutils] Modernize codebase by replacing NULL with nullptr"
am: ab3203f383
Change-Id: I5c2aaaea705a3ab82a5ad999f813e4cc22e63401
Diffstat (limited to 'libutils/String16.cpp')
-rw-r--r-- | libutils/String16.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libutils/String16.cpp b/libutils/String16.cpp index 230e970a4..5c0b406ca 100644 --- a/libutils/String16.cpp +++ b/libutils/String16.cpp @@ -91,7 +91,7 @@ String16::String16() } String16::String16(StaticLinkage) - : mString(0) + : mString(nullptr) { // this constructor is used when we can't rely on the static-initializers // having run. In this case we always allocate an empty string. It's less @@ -342,7 +342,7 @@ status_t String16::makeLower() { const size_t N = size(); const char16_t* str = string(); - char16_t* edit = NULL; + char16_t* edit = nullptr; for (size_t i=0; i<N; i++) { const char16_t v = str[i]; if (v >= 'A' && v <= 'Z') { @@ -364,7 +364,7 @@ status_t String16::replaceAll(char16_t replaceThis, char16_t withThis) { const size_t N = size(); const char16_t* str = string(); - char16_t* edit = NULL; + char16_t* edit = nullptr; for (size_t i=0; i<N; i++) { if (str[i] == replaceThis) { if (!edit) { |