summaryrefslogtreecommitdiff
path: root/libs/utils/String8.cpp
diff options
context:
space:
mode:
author Steve Block <steveblock@google.com> 2012-01-10 14:08:32 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2012-01-10 14:08:32 -0800
commit38e90751a25606459a9e571aa1b6c992d4c64151 (patch)
tree096150aa4d16aca16a4d31ebb87f0dbd0b62ccd9 /libs/utils/String8.cpp
parentf6f793c4ac3670d40a5a38f40388124ddca56cf9 (diff)
parentec193dec4d9ca2cfc8295c4becfe950a906a15ed (diff)
Merge "Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE"
Diffstat (limited to 'libs/utils/String8.cpp')
-rw-r--r--libs/utils/String8.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/utils/String8.cpp b/libs/utils/String8.cpp
index 0bc5aff2216b..562f026f6fd7 100644
--- a/libs/utils/String8.cpp
+++ b/libs/utils/String8.cpp
@@ -80,7 +80,7 @@ static char* allocFromUTF8(const char* in, size_t len)
{
if (len > 0) {
SharedBuffer* buf = SharedBuffer::alloc(len+1);
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (buf) {
char* str = (char*)buf->data();
memcpy(str, in, len);
@@ -103,7 +103,7 @@ static char* allocFromUTF16(const char16_t* in, size_t len)
}
SharedBuffer* buf = SharedBuffer::alloc(bytes+1);
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (!buf) {
return getEmptyString();
}
@@ -125,7 +125,7 @@ static char* allocFromUTF32(const char32_t* in, size_t len)
}
SharedBuffer* buf = SharedBuffer::alloc(bytes+1);
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (!buf) {
return getEmptyString();
}