| Index: base/memory/raw_scoped_refptr_mismatch_checker.h
|
| diff --git a/base/memory/raw_scoped_refptr_mismatch_checker.h b/base/memory/raw_scoped_refptr_mismatch_checker.h
|
| index 7974f3047b2e04fc4b769738f00a2b6e87b2d7a7..01905588058789d8495cedaf556681924f4f32e5 100644
|
| --- a/base/memory/raw_scoped_refptr_mismatch_checker.h
|
| +++ b/base/memory/raw_scoped_refptr_mismatch_checker.h
|
| @@ -47,30 +47,30 @@ struct ParamsUseScopedRefptrCorrectly {
|
| };
|
|
|
| template <>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple0> {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<>> {
|
| enum { value = 1 };
|
| };
|
|
|
| template <typename A>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple1<A> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A>> {
|
| enum { value = !NeedsScopedRefptrButGetsRawPtr<A>::value };
|
| };
|
|
|
| template <typename A, typename B>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple2<A, B> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A, B>> {
|
| enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<B>::value) };
|
| };
|
|
|
| template <typename A, typename B, typename C>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple3<A, B, C> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A, B, C>> {
|
| enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<B>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<C>::value) };
|
| };
|
|
|
| template <typename A, typename B, typename C, typename D>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple4<A, B, C, D> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A, B, C, D>> {
|
| enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<B>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<C>::value ||
|
| @@ -78,7 +78,7 @@ struct ParamsUseScopedRefptrCorrectly<Tuple4<A, B, C, D> > {
|
| };
|
|
|
| template <typename A, typename B, typename C, typename D, typename E>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple5<A, B, C, D, E> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A, B, C, D, E>> {
|
| enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<B>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<C>::value ||
|
| @@ -88,7 +88,7 @@ struct ParamsUseScopedRefptrCorrectly<Tuple5<A, B, C, D, E> > {
|
|
|
| template <typename A, typename B, typename C, typename D, typename E,
|
| typename F>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple6<A, B, C, D, E, F> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A, B, C, D, E, F>> {
|
| enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<B>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<C>::value ||
|
| @@ -99,7 +99,7 @@ struct ParamsUseScopedRefptrCorrectly<Tuple6<A, B, C, D, E, F> > {
|
|
|
| template <typename A, typename B, typename C, typename D, typename E,
|
| typename F, typename G>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple7<A, B, C, D, E, F, G> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A, B, C, D, E, F, G>> {
|
| enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<B>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<C>::value ||
|
| @@ -111,7 +111,7 @@ struct ParamsUseScopedRefptrCorrectly<Tuple7<A, B, C, D, E, F, G> > {
|
|
|
| template <typename A, typename B, typename C, typename D, typename E,
|
| typename F, typename G, typename H>
|
| -struct ParamsUseScopedRefptrCorrectly<Tuple8<A, B, C, D, E, F, G, H> > {
|
| +struct ParamsUseScopedRefptrCorrectly<Tuple<A, B, C, D, E, F, G, H>> {
|
| enum { value = !(NeedsScopedRefptrButGetsRawPtr<A>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<B>::value ||
|
| NeedsScopedRefptrButGetsRawPtr<C>::value ||
|
|
|