commit | 3098ae5665976c97fe20136183cb9465053e66ff | [log] [tgz] |
---|---|---|
author | George Burgess IV <gbiv@google.com> | Tue May 15 13:15:20 2018 -0700 |
committer | George Burgess IV <gbiv@google.com> | Thu May 17 21:24:04 2018 -0700 |
tree | 39ce7a52b1e992080e3804f5840ebc31d9c038c8 | |
parent | 334e5dff4751eb77ade396f4c32404ca2b2892b3 [diff] |
Make a logically const pointer const. Looks like we only ever point kEmptyString at one thing. Bug: None Test: Builds Change-Id: I365d6e3727ceecdb92f23b4aaddf9121d20dc1f7
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;