diff options
| author | 2023-08-18 19:43:38 +0000 | |
|---|---|---|
| committer | 2023-08-18 19:43:38 +0000 | |
| commit | 9836a1cebb1a95112140c96fad1104d191de391e (patch) | |
| tree | b2868830f6884bd31c5444feee6708293c97156a /tools/aapt/SourcePos.cpp | |
| parent | 5eef9a145702b2069656ff6cfd147adfe1adbaab (diff) | |
| parent | 0e91b7269483d6392203606b3a766807d175b4ba (diff) | |
Merge "Use String8/16 c_str [tools]" into udc-dev-plus-aosp am: b370693c67 am: 64441287a5 am: 0e91b72694
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24484497
Change-Id: I1436ad48bfcbe44c5fc67d41f76cd86cd6a62048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt/SourcePos.cpp')
| -rw-r--r-- | tools/aapt/SourcePos.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/aapt/SourcePos.cpp b/tools/aapt/SourcePos.cpp index 38643201c22d..e13028684414 100644 --- a/tools/aapt/SourcePos.cpp +++ b/tools/aapt/SourcePos.cpp @@ -80,12 +80,12 @@ ErrorPos::print(FILE* to) const if (!this->file.isEmpty()) { if (this->line >= 0) { - fprintf(to, "%s:%d: %s%s\n", this->file.string(), this->line, type, this->error.string()); + fprintf(to, "%s:%d: %s%s\n", this->file.c_str(), this->line, type, this->error.c_str()); } else { - fprintf(to, "%s: %s%s\n", this->file.string(), type, this->error.string()); + fprintf(to, "%s: %s%s\n", this->file.c_str(), type, this->error.c_str()); } } else { - fprintf(to, "%s%s\n", type, this->error.string()); + fprintf(to, "%s%s\n", type, this->error.c_str()); } } |