| commit | 7a23fdd7b553b09ffb576c2a9428a512fc963389 | [log] [tgz] |
|---|---|---|
| author | George Burgess IV <gbiv@google.com> | Fri May 18 11:13:26 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 18 11:13:26 2018 -0700 |
| tree | 0863f2822d5036b1034b75bccf35f2b7be44edd5 | |
| parent | 4db88a09dfe85a98c85e9721dd3f6519a8efae07 [diff] | |
| parent | 3d816e19238194a836634c60cc3bd250a29afb39 [diff] |
Merge "Make a logically const pointer const." am: 3d816e1923 Change-Id: I10d084110e0ca2880ba744ad14ee3cbf1288190b
diff --git a/media/libstagefright/foundation/AString.cpp b/media/libstagefright/foundation/AString.cpp index 04fac19..c6ef75f 100644 --- a/media/libstagefright/foundation/AString.cpp +++ b/media/libstagefright/foundation/AString.cpp
@@ -31,7 +31,7 @@ namespace android { // static -const char *AString::kEmptyString = ""; +constexpr const char *AString::kEmptyString; AString::AString() : mData((char *)kEmptyString),
diff --git a/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h b/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h index ff086b3..0f6299c 100644 --- a/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h +++ b/media/libstagefright/foundation/include/media/stagefright/foundation/AString.h
@@ -93,7 +93,7 @@ status_t writeToParcel(Parcel *parcel) const; private: - static const char *kEmptyString; + constexpr static const char *kEmptyString = ""; char *mData; size_t mSize;