summaryrefslogtreecommitdiff
path: root/libs/utils/String8.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2012-01-19 17:26:16 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-01-19 17:26:16 -0800
commitc3c36b4fe5863c8ac0ea5470be633e8fade9c483 (patch)
tree1514a87b96fc32f01298f5438d32acc54f5d57c6 /libs/utils/String8.cpp
parent12b7da69957ef894ce5134989e38479c64308ea1 (diff)
parent9d25b82d280c2d979d500e7da4447148f32f820b (diff)
am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '9d25b82d280c2d979d500e7da4447148f32f820b': Rename LOG_ASSERT to ALOG_ASSERT
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();
}