commit 0b575de8ed0b628d84d256f5846500b0385979bd
author Tim Murray <timmurray@google.com> Fri Mar 15 15:56:43 2013 -0700
committer Tim Murray <timmurray@google.com> Tue Mar 19 15:08:44 2013 -0700
tree 255a20e02100f2c53cfaa05b29fb905b38aa6202
parent 2487bb71ac56dea46ed382739c37f136e67b2062

Add x86 server support.

Change-Id: I674acaf15b67afa48bc736f72942a11e2e38e940

cpp/Element.cpp

diff --git a/cpp/Element.cpp b/cpp/Element.cpp
index f3e83d0..51a96cd 100644
--- a/cpp/Element.cpp
+++ b/cpp/Element.cpp
@@ -40,7 +40,7 @@
     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 @@
     // 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)) {