Bug 1200131 - Avoid shadowing members in tuple.h; r=njn
authorMs2ger <Ms2ger@gmail.com>
Thu, 10 Sep 2015 13:49:19 +0200
changeset 291980 8c56f80b25d372c792929a43438b2b8f16bd69f4
parent 291979 3cab41c410192d237e1bde954bd42abaaca23271
child 291981 4281bd4ca5d819207f81f6c22c66c3cc458b6811
push id5285
push usercmanchester@mozilla.com
push dateThu, 10 Sep 2015 19:28:06 +0000
reviewersnjn
bugs1200131
milestone43.0a1
Bug 1200131 - Avoid shadowing members in tuple.h; r=njn
ipc/chromium/src/base/tuple.h
--- a/ipc/chromium/src/base/tuple.h
+++ b/ipc/chromium/src/base/tuple.h
@@ -73,35 +73,35 @@ struct Tuple0 {
 template <class A>
 struct Tuple1 {
  public:
   typedef A TypeA;
   typedef Tuple1<typename TupleTraits<A>::ValueType> ValueTuple;
   typedef Tuple1<typename TupleTraits<A>::RefType> RefTuple;
 
   Tuple1() {}
-  explicit Tuple1(typename TupleTraits<A>::ParamType a) : a(a) {}
+  explicit Tuple1(typename TupleTraits<A>::ParamType aA) : a(aA) {}
 
   A a;
 };
 
 template <class A, class B>
 struct Tuple2 {
  public:
   typedef A TypeA;
   typedef B TypeB;
   typedef Tuple2<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType> ValueTuple;
   typedef Tuple2<typename TupleTraits<A>::RefType,
                  typename TupleTraits<B>::RefType> RefTuple;
 
   Tuple2() {}
-  Tuple2(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b)
-      : a(a), b(b) {
+  Tuple2(typename TupleTraits<A>::ParamType aA,
+         typename TupleTraits<B>::ParamType aB)
+      : a(aA), b(aB) {
   }
 
   A a;
   B b;
 };
 
 template <class A, class B, class C>
 struct Tuple3 {
@@ -112,20 +112,20 @@ struct Tuple3 {
   typedef Tuple3<typename TupleTraits<A>::ValueType,
                  typename TupleTraits<B>::ValueType,
                  typename TupleTraits<C>::ValueType> ValueTuple;
   typedef Tuple3<typename TupleTraits<A>::RefType,
                  typename TupleTraits<B>::RefType,
                  typename TupleTraits<C>::RefType> RefTuple;
 
   Tuple3() {}
-  Tuple3(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c)
-      : a(a), b(b), c(c){
+  Tuple3(typename TupleTraits<A>::ParamType aA,
+         typename TupleTraits<B>::ParamType aB,
+         typename TupleTraits<C>::ParamType aC)
+      : a(aA), b(aB), c(aC) {
   }
 
   A a;
   B b;
   C c;
 };
 
 template <class A, class B, class C, class D>
@@ -140,21 +140,21 @@ struct Tuple4 {
                  typename TupleTraits<C>::ValueType,
                  typename TupleTraits<D>::ValueType> ValueTuple;
   typedef Tuple4<typename TupleTraits<A>::RefType,
                  typename TupleTraits<B>::RefType,
                  typename TupleTraits<C>::RefType,
                  typename TupleTraits<D>::RefType> RefTuple;
 
   Tuple4() {}
-  Tuple4(typename TupleTraits<A>::ParamType a,
-         typename TupleTraits<B>::ParamType b,
-         typename TupleTraits<C>::ParamType c,
-         typename TupleTraits<D>::ParamType d)
-      : a(a), b(b), c(c), d(d) {
+  Tuple4(typename TupleTraits<A>::ParamType aA,
+         typename TupleTraits<B>::ParamType aB,
+         typename TupleTraits<C>::ParamType aC,
+         typename TupleTraits<D>::ParamType aD)
+      : a(aA), b(aB), c(aC), d(aD) {
   }
 
   A a;
   B b;
   C c;
   D d;
 };
 
@@ -173,22 +173,22 @@ public:
     typename TupleTraits<E>::ValueType> ValueTuple;
   typedef Tuple5<typename TupleTraits<A>::RefType,
     typename TupleTraits<B>::RefType,
     typename TupleTraits<C>::RefType,
     typename TupleTraits<D>::RefType,
     typename TupleTraits<E>::RefType> RefTuple;
 
   Tuple5() {}
-  Tuple5(typename TupleTraits<A>::ParamType a,
-    typename TupleTraits<B>::ParamType b,
-    typename TupleTraits<C>::ParamType c,
-    typename TupleTraits<D>::ParamType d,
-    typename TupleTraits<E>::ParamType e)
-    : a(a), b(b), c(c), d(d), e(e) {
+  Tuple5(typename TupleTraits<A>::ParamType aA,
+         typename TupleTraits<B>::ParamType aB,
+         typename TupleTraits<C>::ParamType aC,
+         typename TupleTraits<D>::ParamType aD,
+         typename TupleTraits<E>::ParamType aE)
+    : a(aA), b(aB), c(aC), d(aD), e(aE) {
   }
 
   A a;
   B b;
   C c;
   D d;
   E e;
 };
@@ -211,23 +211,23 @@ public:
   typedef Tuple6<typename TupleTraits<A>::RefType,
     typename TupleTraits<B>::RefType,
     typename TupleTraits<C>::RefType,
     typename TupleTraits<D>::RefType,
     typename TupleTraits<E>::RefType,
     typename TupleTraits<F>::RefType> RefTuple;
 
   Tuple6() {}
-  Tuple6(typename TupleTraits<A>::ParamType a,
-    typename TupleTraits<B>::ParamType b,
-    typename TupleTraits<C>::ParamType c,
-    typename TupleTraits<D>::ParamType d,
-    typename TupleTraits<E>::ParamType e,
-    typename TupleTraits<F>::ParamType f)
-    : a(a), b(b), c(c), d(d), e(e), f(f) {
+  Tuple6(typename TupleTraits<A>::ParamType aA,
+    typename TupleTraits<B>::ParamType aB,
+    typename TupleTraits<C>::ParamType aC,
+    typename TupleTraits<D>::ParamType aD,
+    typename TupleTraits<E>::ParamType aE,
+    typename TupleTraits<F>::ParamType aF)
+    : a(aA), b(aB), c(aC), d(aD), e(aE), f(aF) {
   }
 
   A a;
   B b;
   C c;
   D d;
   E e;
   F f;
@@ -254,24 +254,24 @@ public:
     typename TupleTraits<B>::RefType,
     typename TupleTraits<C>::RefType,
     typename TupleTraits<D>::RefType,
     typename TupleTraits<E>::RefType,
     typename TupleTraits<F>::RefType,
     typename TupleTraits<G>::RefType> RefTuple;
 
   Tuple7() {}
-  Tuple7(typename TupleTraits<A>::ParamType a,
-    typename TupleTraits<B>::ParamType b,
-    typename TupleTraits<C>::ParamType c,
-    typename TupleTraits<D>::ParamType d,
-    typename TupleTraits<E>::ParamType e,
-    typename TupleTraits<F>::ParamType f,
-    typename TupleTraits<G>::ParamType g)
-    : a(a), b(b), c(c), d(d), e(e), f(f), g(g) {
+  Tuple7(typename TupleTraits<A>::ParamType aA,
+         typename TupleTraits<B>::ParamType aB,
+         typename TupleTraits<C>::ParamType aC,
+         typename TupleTraits<D>::ParamType aD,
+         typename TupleTraits<E>::ParamType aE,
+         typename TupleTraits<F>::ParamType aF,
+         typename TupleTraits<G>::ParamType aG)
+    : a(aA), b(aB), c(aC), d(aD), e(aE), f(aF), g(aG) {
   }
 
   A a;
   B b;
   C c;
   D d;
   E e;
   F f;