Bug 820435 - Fix the B2G builds on gcc-4.6 (NDK r8) due to missing std::nullptr_t in STLPort; r=ehsan
authorJuan Gomez <atilag@gmail.com>
Tue, 11 Dec 2012 20:29:00 -0500
changeset 121310 d1f72af89630659cfc01efead0951fe686aae346
parent 121309 fef8ecbe43f5895eb444f74885ab40340f3c2a63
child 121311 dd214d4f8e98d4f49daa4157dd780eff243cd571
push idunknown
push userunknown
push dateunknown
reviewersehsan
bugs820435
milestone20.0a1
Bug 820435 - Fix the B2G builds on gcc-4.6 (NDK r8) due to missing std::nullptr_t in STLPort; r=ehsan
parser/html/jArray.h
--- a/parser/html/jArray.h
+++ b/parser/html/jArray.h
@@ -96,18 +96,18 @@ class autoJArray {
       return newArray;
     }
     void operator=(const jArray<T,L>& other) {
       delete[] arr;
       arr = other.arr;
       length = other.length;
     }
 #if defined(MOZ_HAVE_CXX11_NULLPTR)
-#  if defined(__clang__) || defined(__ANDROID__)
-    // clang on OS X 10.7 and gcc-4.6 on android does not have std::nullptr_t
+#  if defined(__clang__) || defined(_STLPORT_VERSION)
+    // clang on OS X 10.7 and Android's STLPort do not have std::nullptr_t
     typedef decltype(nullptr) jArray_nullptr_t;
 #  else
     // decltype(nullptr) does not evaluate to std::nullptr_t on GCC 4.6.3
     typedef std::nullptr_t jArray_nullptr_t;
 #  endif
 #elif defined(__GNUC__)
     typedef void* jArray_nullptr_t;
 #elif defined(_WIN64)