Bug 784029 - Revert 783505 when we drop support for gcc 4.2. r=jorendorff.
authorRafael Ávila de Espíndola <respindola@mozilla.com>
Mon, 27 Aug 2012 15:37:34 -0400
changeset 105634 965b4b628696bf16c32a76384ac9907621a5876e
parent 105633 b791baaeb4bdbf5005811ce2af0c48f856448c33
child 105635 5ff334b7781d869e80740bc19f7dabaff1ba609e
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersjorendorff
bugs784029, 783505
milestone17.0a1
Bug 784029 - Revert 783505 when we drop support for gcc 4.2. r=jorendorff.
js/src/jstypedarray.cpp
--- a/js/src/jstypedarray.cpp
+++ b/js/src/jstypedarray.cpp
@@ -1400,24 +1400,18 @@ class TypedArrayTemplate
     // ValueGetter is a function that takes an unwrapped typed array object and
     // returns a Value. Given such a function, Getter<> is a native that
     // retrieves a given Value, probably from a slot on the object.
     template<Value ValueGetter(JSObject *obj)>
     static JSBool
     Getter(JSContext *cx, unsigned argc, Value *vp)
     {
         CallArgs args = CallArgsFromVp(argc, vp);
-        // FIXME: Hack to keep us building with gcc 4.2. Remove this once we
-        // drop support for gcc 4.2. See bug 783505 for the details.
-#if defined(__GNUC__) && __GNUC_MINOR__ <= 2
-        return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args);
-#else
         return CallNonGenericMethod<ThisTypeArray::IsThisClass,
                                     ThisTypeArray::GetterImpl<ValueGetter> >(cx, args);
-#endif
     }
 
     // Define an accessor for a read-only property that invokes a native getter
     template<Value ValueGetter(JSObject *obj)>
     static bool
     DefineGetter(JSContext *cx, PropertyName *name, HandleObject proto)
     {
         RootedId id(cx, NameToId(name));