summaryrefslogtreecommitdiff
path: root/libs/utils/String16.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
commit364cc01b246a77703b902f8fc5099c482759f69c (patch)
tree62ae95e5606b65456e4877a437dfcb3020b7cee1 /libs/utils/String16.cpp
parent1d151e1abaf6c56f26330eac37db43106d912d8b (diff)
parentf2e6108eda3564a98b9f3989ac6fe0174f94ebd8 (diff)
am 9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '9d25b82d280c2d979d500e7da4447148f32f820b': Rename LOG_ASSERT to ALOG_ASSERT
Diffstat (limited to 'libs/utils/String16.cpp')
-rw-r--r--libs/utils/String16.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/utils/String16.cpp b/libs/utils/String16.cpp
index 4ce166426c..94e072fce6 100644
--- a/libs/utils/String16.cpp
+++ b/libs/utils/String16.cpp
@@ -112,7 +112,7 @@ String16::String16(const char16_t* o)
{
size_t len = strlen16(o);
SharedBuffer* buf = SharedBuffer::alloc((len+1)*sizeof(char16_t));
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (buf) {
char16_t* str = (char16_t*)buf->data();
strcpy16(str, o);
@@ -126,7 +126,7 @@ String16::String16(const char16_t* o)
String16::String16(const char16_t* o, size_t len)
{
SharedBuffer* buf = SharedBuffer::alloc((len+1)*sizeof(char16_t));
- LOG_ASSERT(buf, "Unable to allocate shared buffer");
+ ALOG_ASSERT(buf, "Unable to allocate shared buffer");
if (buf) {
char16_t* str = (char16_t*)buf->data();
memcpy(str, o, len*sizeof(char16_t));