Backed out changeset 34f371b1024b (bug 1021290) for Windows build bustage on a CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Thu, 05 Jun 2014 17:35:47 -0700
changeset 206224 be43c638938711dc5f36a341db2d7e2e507e4c0c
parent 206223 122b37a8fa4facb11b1082808ac8953e24694e0f
child 206225 6934964f2c99157fcb9435dccfbf82d50c313633
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1021290
milestone32.0a1
backs out34f371b1024bb9392a29a31280ebf6db534bea38
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
Backed out changeset 34f371b1024b (bug 1021290) for Windows build bustage on a CLOSED TREE
mfbt/Atomics.h
--- a/mfbt/Atomics.h
+++ b/mfbt/Atomics.h
@@ -861,17 +861,16 @@ struct IntrinsicAddSub : public Intrinsi
     return applyBinaryFunction(&Primitives::sub, aPtr, aVal);
   }
 };
 
 template<typename T>
 struct IntrinsicAddSub<T*> : public IntrinsicApplyHelper<T*>
 {
   typedef typename IntrinsicApplyHelper<T*>::ValueType ValueType;
-  typedef typename IntrinsicBase<T>::Primitives Primitives;
 
   static ValueType add(ValueType& aPtr, ptrdiff_t aAmount)
   {
     return applyBinaryFunction(&Primitives::add, aPtr,
                                (ValueType)(aAmount * sizeof(ValueType)));
   }
 
   static ValueType sub(ValueType& aPtr, ptrdiff_t aAmount)
@@ -889,17 +888,16 @@ struct IntrinsicIncDec : public Intrinsi
   static ValueType dec(ValueType& aPtr) { return sub(aPtr, 1); }
 };
 
 template<typename T, MemoryOrdering Order>
 struct AtomicIntrinsics : public IntrinsicMemoryOps<T, Order>,
                           public IntrinsicIncDec<T>
 {
   typedef typename IntrinsicIncDec<T>::ValueType ValueType;
-  typedef typename IntrinsicBase<T>::Primitives Primitives;
 
   static ValueType or_(ValueType& aPtr, T aVal)
   {
     return applyBinaryFunction(&Primitives::or_, aPtr, aVal);
   }
 
   static ValueType xor_(ValueType& aPtr, T aVal)
   {