From cd8a21055562cca41741b1ae14f65186fada07ad Mon Sep 17 00:00:00 2001 From: Dave Hylands Date: Thu, 8 Jan 2015 13:52:20 -0800 Subject: [PATCH] Bug 1073003 - Fix warnings in stlport causing errors in emulator build. r=bzbarsky --- build/stlport/stlport/stl/_istream.c | 1 - build/stlport/stlport/stl/_slist.c | 1 - build/stlport/stlport/stl/config/features.h | 3 ++- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/stlport/stlport/stl/_istream.c b/build/stlport/stlport/stl/_istream.c index ab327b296911..724ad24b7386 100644 --- a/build/stlport/stlport/stl/_istream.c +++ b/build/stlport/stlport/stl/_istream.c @@ -1145,7 +1145,6 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __delim) { if (__sentry) { basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf(); - typedef _STLP_PRIV _Constant_unary_fun _Const_bool; typedef _STLP_PRIV _Constant_binary_fun _Const_streamsize; const streamsize __maxss = (numeric_limits::max)(); diff --git a/build/stlport/stlport/stl/_slist.c b/build/stlport/stlport/stl/_slist.c index ba158d00c5d5..107b600b4ca1 100644 --- a/build/stlport/stlport/stl/_slist.c +++ b/build/stlport/stlport/stl/_slist.c @@ -148,7 +148,6 @@ template void _Slist_merge(slist<_Tp, _Alloc>& __that, slist<_Tp, _Alloc>& __x, _StrictWeakOrdering __comp) { typedef _Slist_node<_Tp> _Node; - typedef _STLP_PRIV _Slist_node_base _Node_base; if (__that.get_allocator() == __x.get_allocator()) { typename slist<_Tp, _Alloc>::iterator __ite(__that.before_begin()); while (__ite._M_node->_M_next && !__x.empty()) { diff --git a/build/stlport/stlport/stl/config/features.h b/build/stlport/stlport/stl/config/features.h index c1eb53c87017..16694801445d 100644 --- a/build/stlport/stlport/stl/config/features.h +++ b/build/stlport/stlport/stl/config/features.h @@ -308,7 +308,8 @@ /* Some compiler support 0 size array so we use negative size array to generate * a compilation time error. */ -# define _STLP_STATIC_ASSERT(expr) typedef char __static_assert[expr ? 1 : -1]; +//# define _STLP_STATIC_ASSERT(expr) typedef char __static_assert[expr ? 1 : -1]; +# define _STLP_STATIC_ASSERT(expr) static_assert(expr, "static_assert failed"); #endif /* apple mpw exception handling bug */