summaryrefslogtreecommitdiff
path: root/cpp/Element.cpp
diff options
context:
space:
mode:
authorTim Murray <timmurray@google.com>2013-03-15 15:56:43 -0700
committerTim Murray <timmurray@google.com>2013-03-19 15:08:44 -0700
commit0b575de8ed0b628d84d256f5846500b0385979bd (patch)
tree255a20e02100f2c53cfaa05b29fb905b38aa6202 /cpp/Element.cpp
parent2487bb71ac56dea46ed382739c37f136e67b2062 (diff)
downloadrs-0b575de8ed0b628d84d256f5846500b0385979bd.tar.gz
Add x86 server support.
Change-Id: I674acaf15b67afa48bc736f72942a11e2e38e940
Diffstat (limited to 'cpp/Element.cpp')
-rw-r--r--cpp/Element.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/Element.cpp b/cpp/Element.cpp
index f3e83d0c..51a96cd2 100644
--- a/cpp/Element.cpp
+++ b/cpp/Element.cpp
@@ -40,7 +40,7 @@ const char * Element::getSubElementName(uint32_t index) {
if (index >= mVisibleElementMap.size()) {
mRS->throwError("Illegal sub-element index");
}
- return mElementNames[mVisibleElementMap[index]];
+ return mElementNames[mVisibleElementMap[index]].string();
}
size_t Element::getSubElementArraySize(uint32_t index) {
@@ -338,7 +338,7 @@ void Element::Builder::add(sp</*const*/ Element>e, android::String8 &name, uint3
// Skip padding fields after a vector 3 type.
if (mSkipPadding) {
const char *s1 = "#padding_";
- const char *s2 = name;
+ const char *s2 = name.string();
size_t len = strlen(s1);
if (strlen(s2) >= len) {
if (!memcmp(s1, s2, len)) {