diff options
| author | Steven Moreland <smoreland@google.com> | 2017-03-11 09:07:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-11 09:07:23 +0000 |
| commit | aa47993b23aff7d473085d723cbe29ef6e63da08 (patch) | |
| tree | 464b2d6b65be61714f581a17543c26b368856624 /libutils/include | |
| parent | be09d5b735153f81804f2e29828be3b642c22f8a (diff) | |
| parent | 4ba3f784efb67ebc39aa7591fe8c55df6ba7d1be (diff) | |
| download | system_core-aa47993b23aff7d473085d723cbe29ef6e63da08.tar.gz system_core-aa47993b23aff7d473085d723cbe29ef6e63da08.tar.bz2 system_core-aa47993b23aff7d473085d723cbe29ef6e63da08.zip | |
Merge "libutils: String\d+ make std_string private" am: 76850afa52 am: 2ebb1e5404
am: 4ba3f784ef
Change-Id: I14f003992db222ef285551c6d9a8ffe71620f70d
Diffstat (limited to 'libutils/include')
| -rw-r--r-- | libutils/include/utils/String16.h | 3 | ||||
| -rw-r--r-- | libutils/include/utils/String8.h | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/libutils/include/utils/String16.h b/libutils/include/utils/String16.h index 07c4de746..f6433a829 100644 --- a/libutils/include/utils/String16.h +++ b/libutils/include/utils/String16.h @@ -67,7 +67,10 @@ public: inline const char16_t* string() const; +//TODO(b/35363681): remove +private: static inline std::string std_string(const String16& str); +public: size_t size() const; void setTo(const String16& other); status_t setTo(const char16_t* other); diff --git a/libutils/include/utils/String8.h b/libutils/include/utils/String8.h index 1d12994d1..f5f9219a1 100644 --- a/libutils/include/utils/String8.h +++ b/libutils/include/utils/String8.h @@ -64,8 +64,14 @@ public: static String8 format(const char* fmt, ...) __attribute__((format (printf, 1, 2))); static String8 formatV(const char* fmt, va_list args); + inline const char* c_str() const; inline const char* string() const; + +// TODO(b/35363681): remove +private: static inline std::string std_string(const String8& str); +public: + inline size_t size() const; inline size_t bytes() const; inline bool isEmpty() const; @@ -259,6 +265,10 @@ inline const String8 String8::empty() { return String8(); } +inline const char* String8::c_str() const +{ + return mString; +} inline const char* String8::string() const { return mString; |