aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2013-04-16 11:44:51 +0300
committerJukka Jylänki <jujjyl@gmail.com>2013-04-16 11:44:51 +0300
commit2f7322d0d0987c66c6ab15d34357db8ab054ae74 (patch)
treefd7e9d77035e8e67906cf6f559ba29a0557bcbc7
parent9437ede8d7d46da1715948f67b97d39475028e93 (diff)
Revert "Fix cxa_demangle compile errors". By feedback from azakai, we want to keep our libcxxabi clean from custom changes w.r.t. upsstream libcxxabi.
This reverts commit 848c186df3a8f1eff6e7b1af0b08df25aefae0e3.
-rw-r--r--system/lib/libcxxabi/src/cxa_demangle.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/system/lib/libcxxabi/src/cxa_demangle.cpp b/system/lib/libcxxabi/src/cxa_demangle.cpp
index 804ea7ce..c1e12603 100644
--- a/system/lib/libcxxabi/src/cxa_demangle.cpp
+++ b/system/lib/libcxxabi/src/cxa_demangle.cpp
@@ -5695,7 +5695,7 @@ public:
if (__right_ != 0)
r += __right_->size();
else if (__size_ != 0)
- r += static_cast<size_t>(snprintf(0, 0, "%lu", static_cast<unsigned long>(__size_)));
+ r += static_cast<size_t>(snprintf(0, 0, "%ld", __size_));
const_cast<long&>(__cached_size_) = static_cast<long>(r);
}
return static_cast<size_t>(__cached_size_);
@@ -5710,7 +5710,7 @@ public:
buf = __right_->get_demangled_name(buf);
else if (__size_ != 0)
{
- int rs = sprintf(buf, "%lu", static_cast<unsigned long>(__size_));
+ int rs = sprintf(buf, "%ld", __size_);
buf += rs;
}
*buf++ = ']';
@@ -5735,7 +5735,7 @@ public:
if (__right_ != 0)
r += __right_->size();
else if (__size_ != 0)
- r += static_cast<size_t>(snprintf(0, 0, "%lu", static_cast<unsigned long>(__size_)));
+ r += static_cast<size_t>(snprintf(0, 0, "%ld", __size_));
return r;
}
@@ -5747,7 +5747,7 @@ public:
buf = __right_->get_demangled_name(buf);
else if (__size_ != 0)
{
- int off = sprintf(buf, "%lu", static_cast<unsigned long>(__size_));
+ int off = sprintf(buf, "%ld", __size_);
buf += off;
}
char* t = buf;