diff options
| author | avi <avi@chromium.org> | 2014-12-23 13:47:26 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-23 21:48:10 +0000 |
| commit | 4f841af78da6aeeeed3557f40e5c00d06ff9ce3c (patch) | |
| tree | dfac76e6655a7e52e084c53439081e7bd8bef7f7 /base | |
| parent | 809cd0ca6770eb6748fadb5f6528dfd46e0ccd01 (diff) | |
| download | chromium_src-4f841af78da6aeeeed3557f40e5c00d06ff9ce3c.zip chromium_src-4f841af78da6aeeeed3557f40e5c00d06ff9ce3c.tar.gz chromium_src-4f841af78da6aeeeed3557f40e5c00d06ff9ce3c.tar.bz2 | |
Revert of Revert "Update legacy Tuple-using code." (patchset #1 id:1 of https://codereview.chromium.org/826573002/)
Reason for revert:
The tests should have failed with this. Undoing the revert.
Original issue's description:
> Revert "Update legacy Tuple-using code."
>
> This reverts commit 12f4b98357b9dedc93cb546aac0aece2c8d9e850
>
> BUG=440675, 444827
>
> Committed: https://chromium.googlesource.com/chromium/src/+/85748694f2a119a057088f77f70b97f11607473c
TBR=
NOTREECHECKS=true
NOTRY=true
BUG=440675, 444827
Review URL: https://codereview.chromium.org/794073003
Cr-Commit-Position: refs/heads/master@{#309586}
Diffstat (limited to 'base')
| -rw-r--r-- | base/tuple.h | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/base/tuple.h b/base/tuple.h index a0d2245..4408074 100644 --- a/base/tuple.h +++ b/base/tuple.h @@ -124,71 +124,6 @@ struct TupleLeaf { T x; }; -// For legacy compatibility, we name the first 8 tuple elements "a", "b", ... -// TODO(mdempsky): Update users to use get<N>() (crbug.com/440675). - -#define DEFINE_TUPLE_LEAF(N, x) \ - template <typename T> \ - struct TupleLeaf<N, T> { \ - TupleLeaf() {} \ - explicit TupleLeaf(typename TupleTraits<T>::ParamType x) : x(x) {} \ - \ - T& get() { return x; } \ - const T& get() const { return x; } \ - \ - T x; \ - } - -DEFINE_TUPLE_LEAF(0, a); -DEFINE_TUPLE_LEAF(1, b); -DEFINE_TUPLE_LEAF(2, c); -DEFINE_TUPLE_LEAF(3, d); -DEFINE_TUPLE_LEAF(4, e); -DEFINE_TUPLE_LEAF(5, f); -DEFINE_TUPLE_LEAF(6, g); -DEFINE_TUPLE_LEAF(7, h); - -#undef DEFINE_TUPLE_LEAF - -// Deprecated compat aliases -// TODO(mdempsky): Update users to just use Tuple instead (crbug.com/440675). - -using Tuple0 = Tuple<>; -template <typename A> -using Tuple1 = Tuple<A>; -template <typename A, typename B> -using Tuple2 = Tuple<A, B>; -template <typename A, typename B, typename C> -using Tuple3 = Tuple<A, B, C>; -template <typename A, typename B, typename C, typename D> -using Tuple4 = Tuple<A, B, C, D>; -template <typename A, typename B, typename C, typename D, typename E> -using Tuple5 = Tuple<A, B, C, D, E>; -template <typename A, - typename B, - typename C, - typename D, - typename E, - typename F> -using Tuple6 = Tuple<A, B, C, D, E, F>; -template <typename A, - typename B, - typename C, - typename D, - typename E, - typename F, - typename G> -using Tuple7 = Tuple<A, B, C, D, E, F, G>; -template <typename A, - typename B, - typename C, - typename D, - typename E, - typename F, - typename G, - typename H> -using Tuple8 = Tuple<A, B, C, D, E, F, G, H>; - // Tuple getters -------------------------------------------------------------- // // Allows accessing an arbitrary tuple element by index. |