Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(577)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ipc/ipc_message_utils.h

Issue 1770013002: Replace base::Tuple in //ipc with std::tuple (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: +#include Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_message_templates_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_message_utils.h
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h
index 971370a258ae071dcc89c626102e72506b1c4b64..d92d8335f1a2cddee3d3ee487cd551dba8b20081 100644
--- a/ipc/ipc_message_utils.h
+++ b/ipc/ipc_message_utils.h
@@ -13,6 +13,7 @@
#include <map>
#include <set>
#include <string>
+#include <tuple>
#include <vector>
#include "base/containers/small_map.h"
@@ -24,7 +25,6 @@
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
-#include "base/tuple.h"
#include "build/build_config.h"
#include "ipc/brokerable_attachment.h"
#include "ipc/ipc_message_start.h"
@@ -666,18 +666,18 @@ template <class A>
struct ParamTraits<std::tuple<A>> {
typedef std::tuple<A> param_type;
static void GetSize(base::PickleSizer* sizer, const param_type& p) {
- GetParamSize(sizer, base::get<0>(p));
+ GetParamSize(sizer, std::get<0>(p));
}
static void Write(base::Pickle* m, const param_type& p) {
- WriteParam(m, base::get<0>(p));
+ WriteParam(m, std::get<0>(p));
}
static bool Read(const base::Pickle* m,
base::PickleIterator* iter,
param_type* r) {
- return ReadParam(m, iter, &base::get<0>(*r));
+ return ReadParam(m, iter, &std::get<0>(*r));
}
static void Log(const param_type& p, std::string* l) {
- LogParam(base::get<0>(p), l);
+ LogParam(std::get<0>(p), l);
}
};
@@ -685,23 +685,23 @@ template <class A, class B>
struct ParamTraits<std::tuple<A, B>> {
typedef std::tuple<A, B> param_type;
static void GetSize(base::PickleSizer* sizer, const param_type& p) {
- GetParamSize(sizer, base::get<0>(p));
- GetParamSize(sizer, base::get<1>(p));
+ GetParamSize(sizer, std::get<0>(p));
+ GetParamSize(sizer, std::get<1>(p));
}
static void Write(base::Pickle* m, const param_type& p) {
- WriteParam(m, base::get<0>(p));
- WriteParam(m, base::get<1>(p));
+ WriteParam(m, std::get<0>(p));
+ WriteParam(m, std::get<1>(p));
}
static bool Read(const base::Pickle* m,
base::PickleIterator* iter,
param_type* r) {
- return (ReadParam(m, iter, &base::get<0>(*r)) &&
- ReadParam(m, iter, &base::get<1>(*r)));
+ return (ReadParam(m, iter, &std::get<0>(*r)) &&
+ ReadParam(m, iter, &std::get<1>(*r)));
}
static void Log(const param_type& p, std::string* l) {
- LogParam(base::get<0>(p), l);
+ LogParam(std::get<0>(p), l);
l->append(", ");
- LogParam(base::get<1>(p), l);
+ LogParam(std::get<1>(p), l);
}
};
@@ -709,28 +709,28 @@ template <class A, class B, class C>
struct ParamTraits<std::tuple<A, B, C>> {
typedef std::tuple<A, B, C> param_type;
static void GetSize(base::PickleSizer* sizer, const param_type& p) {
- GetParamSize(sizer, base::get<0>(p));
- GetParamSize(sizer, base::get<1>(p));
- GetParamSize(sizer, base::get<2>(p));
+ GetParamSize(sizer, std::get<0>(p));
+ GetParamSize(sizer, std::get<1>(p));
+ GetParamSize(sizer, std::get<2>(p));
}
static void Write(base::Pickle* m, const param_type& p) {
- WriteParam(m, base::get<0>(p));
- WriteParam(m, base::get<1>(p));
- WriteParam(m, base::get<2>(p));
+ WriteParam(m, std::get<0>(p));
+ WriteParam(m, std::get<1>(p));
+ WriteParam(m, std::get<2>(p));
}
static bool Read(const base::Pickle* m,
base::PickleIterator* iter,
param_type* r) {
- return (ReadParam(m, iter, &base::get<0>(*r)) &&
- ReadParam(m, iter, &base::get<1>(*r)) &&
- ReadParam(m, iter, &base::get<2>(*r)));
+ return (ReadParam(m, iter, &std::get<0>(*r)) &&
+ ReadParam(m, iter, &std::get<1>(*r)) &&
+ ReadParam(m, iter, &std::get<2>(*r)));
}
static void Log(const param_type& p, std::string* l) {
- LogParam(base::get<0>(p), l);
+ LogParam(std::get<0>(p), l);
l->append(", ");
- LogParam(base::get<1>(p), l);
+ LogParam(std::get<1>(p), l);
l->append(", ");
- LogParam(base::get<2>(p), l);
+ LogParam(std::get<2>(p), l);
}
};
@@ -738,33 +738,33 @@ template <class A, class B, class C, class D>
struct ParamTraits<std::tuple<A, B, C, D>> {
typedef std::tuple<A, B, C, D> param_type;
static void GetSize(base::PickleSizer* sizer, const param_type& p) {
- GetParamSize(sizer, base::get<0>(p));
- GetParamSize(sizer, base::get<1>(p));
- GetParamSize(sizer, base::get<2>(p));
- GetParamSize(sizer, base::get<3>(p));
+ GetParamSize(sizer, std::get<0>(p));
+ GetParamSize(sizer, std::get<1>(p));
+ GetParamSize(sizer, std::get<2>(p));
+ GetParamSize(sizer, std::get<3>(p));
}
static void Write(base::Pickle* m, const param_type& p) {
- WriteParam(m, base::get<0>(p));
- WriteParam(m, base::get<1>(p));
- WriteParam(m, base::get<2>(p));
- WriteParam(m, base::get<3>(p));
+ WriteParam(m, std::get<0>(p));
+ WriteParam(m, std::get<1>(p));
+ WriteParam(m, std::get<2>(p));
+ WriteParam(m, std::get<3>(p));
}
static bool Read(const base::Pickle* m,
base::PickleIterator* iter,
param_type* r) {
- return (ReadParam(m, iter, &base::get<0>(*r)) &&
- ReadParam(m, iter, &base::get<1>(*r)) &&
- ReadParam(m, iter, &base::get<2>(*r)) &&
- ReadParam(m, iter, &base::get<3>(*r)));
+ return (ReadParam(m, iter, &std::get<0>(*r)) &&
+ ReadParam(m, iter, &std::get<1>(*r)) &&
+ ReadParam(m, iter, &std::get<2>(*r)) &&
+ ReadParam(m, iter, &std::get<3>(*r)));
}
static void Log(const param_type& p, std::string* l) {
- LogParam(base::get<0>(p), l);
+ LogParam(std::get<0>(p), l);
l->append(", ");
- LogParam(base::get<1>(p), l);
+ LogParam(std::get<1>(p), l);
l->append(", ");
- LogParam(base::get<2>(p), l);
+ LogParam(std::get<2>(p), l);
l->append(", ");
- LogParam(base::get<3>(p), l);
+ LogParam(std::get<3>(p), l);
}
};
@@ -772,38 +772,38 @@ template <class A, class B, class C, class D, class E>
struct ParamTraits<std::tuple<A, B, C, D, E>> {
typedef std::tuple<A, B, C, D, E> param_type;
static void GetSize(base::PickleSizer* sizer, const param_type& p) {
- GetParamSize(sizer, base::get<0>(p));
- GetParamSize(sizer, base::get<1>(p));
- GetParamSize(sizer, base::get<2>(p));
- GetParamSize(sizer, base::get<3>(p));
- GetParamSize(sizer, base::get<4>(p));
+ GetParamSize(sizer, std::get<0>(p));
+ GetParamSize(sizer, std::get<1>(p));
+ GetParamSize(sizer, std::get<2>(p));
+ GetParamSize(sizer, std::get<3>(p));
+ GetParamSize(sizer, std::get<4>(p));
}
static void Write(base::Pickle* m, const param_type& p) {
- WriteParam(m, base::get<0>(p));
- WriteParam(m, base::get<1>(p));
- WriteParam(m, base::get<2>(p));
- WriteParam(m, base::get<3>(p));
- WriteParam(m, base::get<4>(p));
+ WriteParam(m, std::get<0>(p));
+ WriteParam(m, std::get<1>(p));
+ WriteParam(m, std::get<2>(p));
+ WriteParam(m, std::get<3>(p));
+ WriteParam(m, std::get<4>(p));
}
static bool Read(const base::Pickle* m,
base::PickleIterator* iter,
param_type* r) {
- return (ReadParam(m, iter, &base::get<0>(*r)) &&
- ReadParam(m, iter, &base::get<1>(*r)) &&
- ReadParam(m, iter, &base::get<2>(*r)) &&
- ReadParam(m, iter, &base::get<3>(*r)) &&
- ReadParam(m, iter, &base::get<4>(*r)));
+ return (ReadParam(m, iter, &std::get<0>(*r)) &&
+ ReadParam(m, iter, &std::get<1>(*r)) &&
+ ReadParam(m, iter, &std::get<2>(*r)) &&
+ ReadParam(m, iter, &std::get<3>(*r)) &&
+ ReadParam(m, iter, &std::get<4>(*r)));
}
static void Log(const param_type& p, std::string* l) {
- LogParam(base::get<0>(p), l);
+ LogParam(std::get<0>(p), l);
l->append(", ");
- LogParam(base::get<1>(p), l);
+ LogParam(std::get<1>(p), l);
l->append(", ");
- LogParam(base::get<2>(p), l);
+ LogParam(std::get<2>(p), l);
l->append(", ");
- LogParam(base::get<3>(p), l);
+ LogParam(std::get<3>(p), l);
l->append(", ");
- LogParam(base::get<4>(p), l);
+ LogParam(std::get<4>(p), l);
}
};
« no previous file with comments | « ipc/ipc_message_templates_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698