Index: ipc/ipc_message_utils.h |
diff --git a/ipc/ipc_message_utils.h b/ipc/ipc_message_utils.h |
index 9ae39c20e17809d2b08c28e3840915038e14ad30..330bb38776b276b1f693103a1b0e6fe5158eb001 100644 |
--- a/ipc/ipc_message_utils.h |
+++ b/ipc/ipc_message_utils.h |
@@ -635,8 +635,8 @@ struct IPC_EXPORT ParamTraits<base::TimeTicks> { |
}; |
template <> |
-struct ParamTraits<base::Tuple<>> { |
- typedef base::Tuple<> param_type; |
+struct ParamTraits<std::tuple<>> { |
+ typedef std::tuple<> param_type; |
static void GetSize(base::PickleSizer* sizer, const param_type& p) {} |
static void Write(base::Pickle* m, const param_type& p) {} |
static bool Read(const base::Pickle* m, |
@@ -649,8 +649,8 @@ struct ParamTraits<base::Tuple<>> { |
}; |
template <class A> |
-struct ParamTraits<base::Tuple<A>> { |
- typedef base::Tuple<A> param_type; |
+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)); |
} |
@@ -668,8 +668,8 @@ struct ParamTraits<base::Tuple<A>> { |
}; |
template <class A, class B> |
-struct ParamTraits<base::Tuple<A, B>> { |
- typedef base::Tuple<A, B> param_type; |
+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)); |
@@ -692,8 +692,8 @@ struct ParamTraits<base::Tuple<A, B>> { |
}; |
template <class A, class B, class C> |
-struct ParamTraits<base::Tuple<A, B, C>> { |
- typedef base::Tuple<A, B, C> param_type; |
+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)); |
@@ -721,8 +721,8 @@ struct ParamTraits<base::Tuple<A, B, C>> { |
}; |
template <class A, class B, class C, class D> |
-struct ParamTraits<base::Tuple<A, B, C, D>> { |
- typedef base::Tuple<A, B, C, D> param_type; |
+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)); |
@@ -755,8 +755,8 @@ struct ParamTraits<base::Tuple<A, B, C, D>> { |
}; |
template <class A, class B, class C, class D, class E> |
-struct ParamTraits<base::Tuple<A, B, C, D, E>> { |
- typedef base::Tuple<A, B, C, D, E> param_type; |
+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)); |