Bug 1119571 - Backout the part of bug 1073003 touching stlport
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 10 Jan 2015 06:52:04 +0900
changeset 248902 ac811920efd696a27e80ffd15218794169f91e47
parent 248901 7475b716558d7543e6762b7d61f4be1951cd790e
child 248903 7d301619ebacf61442f86c6ac5b3c73abc6fa60b
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1119571, 1073003
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1119571 - Backout the part of bug 1073003 touching stlport
build/stlport/README.mozilla
build/stlport/fix-warnings-as-errors.patch
build/stlport/stlport/stl/_istream.c
build/stlport/stlport/stl/_slist.c
build/stlport/stlport/stl/config/features.h
--- a/build/stlport/README.mozilla
+++ b/build/stlport/README.mozilla
@@ -2,11 +2,8 @@ This copy of STLport was taken from the 
 Android specific changes are listed in README.android.
 The libs/ directory containing prebuilt static libraries was removed.
 The overrides/ directory contains Mozilla-specific overrides to the standard
   C++ headers found in the NDK.
 
 The following patches are applied on top:
 - android-mozilla-config.patch: Adjusts Android-specific configuration
   to the mozilla codebase use of the STL.
-
-- fix-warnings-as-errors.patch: Fixes warnings which were causing the
-  B2G emulator-ICS build to fail (related to bug 1073003).
deleted file mode 100644
--- a/build/stlport/fix-warnings-as-errors.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-# HG changeset patch
-# Parent f89b28ea7c7b7fcb54c34e74fcb047626300bfba
-# User Dave Hylands <dhylands@mozilla.com>
-Bug 1073003 - Fix warnings in stlport causing errors in emulator build.
-
-diff --git a/build/stlport/stlport/stl/_istream.c b/build/stlport/stlport/stl/_istream.c
---- a/build/stlport/stlport/stl/_istream.c
-+++ b/build/stlport/stlport/stl/_istream.c
-@@ -1140,17 +1140,16 @@ basic_istream<_CharT, _Traits>::ignore(s
- template <class _CharT, class _Traits>
- basic_istream<_CharT, _Traits>&
- basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __delim) {
-   sentry __sentry(*this, _No_Skip_WS());
-   this->_M_gcount = 0;
- 
-   if (__sentry) {
-     basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
--    typedef _STLP_PRIV _Constant_unary_fun<bool, int_type> _Const_bool;
-     typedef _STLP_PRIV _Constant_binary_fun<streamsize, streamsize, streamsize>
-       _Const_streamsize;
-     const streamsize __maxss = (numeric_limits<streamsize>::max)();
- 
-     if (__n == (numeric_limits<int>::max)()) {
-       if (__buf->gptr() != __buf->egptr())
-         _M_gcount = _M_ignore_buffered(this,  __buf,
-                                        __maxss, _Const_streamsize(__maxss),
-diff --git a/build/stlport/stlport/stl/_slist.c b/build/stlport/stlport/stl/_slist.c
---- a/build/stlport/stlport/stl/_slist.c
-+++ b/build/stlport/stlport/stl/_slist.c
-@@ -143,17 +143,16 @@ void _Slist_unique(slist<_Tp, _Alloc>& _
-     }
-   }
- }
- 
- template <class _Tp, class _Alloc, class _StrictWeakOrdering>
- 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()) {
-       if (__comp(__x.front(), __STATIC_CAST(_Node*, __ite._M_node->_M_next)->_M_data)) {
-         _STLP_VERBOSE_ASSERT(!__comp(__STATIC_CAST(_Node*, __ite._M_node->_M_next)->_M_data, __x.front()),
-                              _StlMsg_INVALID_STRICT_WEAK_PREDICATE)
-         __that.splice_after(__ite, __x, __x.before_begin());
-       }
-diff --git a/build/stlport/stlport/stl/config/features.h b/build/stlport/stlport/stl/config/features.h
---- a/build/stlport/stlport/stl/config/features.h
-+++ b/build/stlport/stlport/stl/config/features.h
-@@ -303,17 +303,18 @@
- #  undef  _STLP_NO_DEFAULT_NON_TYPE_PARAM
- #  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
- #endif
- 
- #if !defined (_STLP_STATIC_ASSERT)
- /* 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 */
- #ifndef _STLP_MPWFIX_TRY
- #  define _STLP_MPWFIX_TRY
- #endif
- #ifndef _STLP_MPWFIX_CATCH
- #  define _STLP_MPWFIX_CATCH
--- a/build/stlport/stlport/stl/_istream.c
+++ b/build/stlport/stlport/stl/_istream.c
@@ -1140,16 +1140,17 @@ basic_istream<_CharT, _Traits>::ignore(s
 template <class _CharT, class _Traits>
 basic_istream<_CharT, _Traits>&
 basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __delim) {
   sentry __sentry(*this, _No_Skip_WS());
   this->_M_gcount = 0;
 
   if (__sentry) {
     basic_streambuf<_CharT, _Traits>* __buf = this->rdbuf();
+    typedef _STLP_PRIV _Constant_unary_fun<bool, int_type> _Const_bool;
     typedef _STLP_PRIV _Constant_binary_fun<streamsize, streamsize, streamsize>
       _Const_streamsize;
     const streamsize __maxss = (numeric_limits<streamsize>::max)();
 
     if (__n == (numeric_limits<int>::max)()) {
       if (__buf->gptr() != __buf->egptr())
         _M_gcount = _M_ignore_buffered(this,  __buf,
                                        __maxss, _Const_streamsize(__maxss),
--- a/build/stlport/stlport/stl/_slist.c
+++ b/build/stlport/stlport/stl/_slist.c
@@ -143,16 +143,17 @@ void _Slist_unique(slist<_Tp, _Alloc>& _
     }
   }
 }
 
 template <class _Tp, class _Alloc, class _StrictWeakOrdering>
 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()) {
       if (__comp(__x.front(), __STATIC_CAST(_Node*, __ite._M_node->_M_next)->_M_data)) {
         _STLP_VERBOSE_ASSERT(!__comp(__STATIC_CAST(_Node*, __ite._M_node->_M_next)->_M_data, __x.front()),
                              _StlMsg_INVALID_STRICT_WEAK_PREDICATE)
         __that.splice_after(__ite, __x, __x.before_begin());
       }
--- a/build/stlport/stlport/stl/config/features.h
+++ b/build/stlport/stlport/stl/config/features.h
@@ -303,18 +303,17 @@
 #  undef  _STLP_NO_DEFAULT_NON_TYPE_PARAM
 #  define _STLP_NO_DEFAULT_NON_TYPE_PARAM 1
 #endif
 
 #if !defined (_STLP_STATIC_ASSERT)
 /* 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) static_assert(expr, "static_assert failed");
+#  define _STLP_STATIC_ASSERT(expr) typedef char __static_assert[expr ? 1 : -1];
 #endif
 
 /* apple mpw exception handling bug */
 #ifndef _STLP_MPWFIX_TRY
 #  define _STLP_MPWFIX_TRY
 #endif
 #ifndef _STLP_MPWFIX_CATCH
 #  define _STLP_MPWFIX_CATCH