1 # HG changeset patch

     2 # Parent 993c5b5a44ca18c5273b74c75704b418c2477d28

     3 bmo#783505 - bump gcc version required for building without template hacks

     4 

     5 diff --git a/js/src/jstypedarray.cpp b/js/src/jstypedarray.cpp

     6 --- a/js/src/jstypedarray.cpp

     7 +++ b/js/src/jstypedarray.cpp

     8 @@ -1404,17 +1404,17 @@ class TypedArrayTemplate

     9      // retrieves a given Value, probably from a slot on the object.

    10      template<Value ValueGetter(JSObject *obj)>

    11      static JSBool

    12      Getter(JSContext *cx, unsigned argc, Value *vp)

    13      {

    14          CallArgs args = CallArgsFromVp(argc, vp);

    15          // FIXME: Hack to keep us building with gcc 4.2. Remove this once we

    16          // drop support for gcc 4.2. See bug 783505 for the details.

    17 -#if defined(__GNUC__) && __GNUC_MINOR__ <= 2

    18 +#if defined(__GNUC__) && __GNUC_MINOR__ <= 3

    19          return CallNonGenericMethod(cx, IsThisClass, GetterImpl<ValueGetter>, args);

    20  #else

    21          return CallNonGenericMethod<ThisTypeArray::IsThisClass,

    22                                      ThisTypeArray::GetterImpl<ValueGetter> >(cx, args);

    23  #endif

    24      }

    25  

    26      // Define an accessor for a read-only property that invokes a native getter