Index: ppapi/proxy/nacl_message_scanner.cc |
diff --git a/ppapi/proxy/nacl_message_scanner.cc b/ppapi/proxy/nacl_message_scanner.cc |
index a31ba624872b8b3a023315608e6231470fb5f5f9..a48ae8ea769271d68cdf0da21586d9afd6ead401 100644 |
--- a/ppapi/proxy/nacl_message_scanner.cc |
+++ b/ppapi/proxy/nacl_message_scanner.cc |
@@ -149,26 +149,26 @@ void ScanParam(const T& param, ScanningResults* results) { |
// The idea is to scan elements in the tuple which require special handling, |
// and write them into the |results| struct. |
template <class A> |
-void ScanTuple(const Tuple<A>& t1, ScanningResults* results) { |
- ScanParam(get<0>(t1), results); |
+void ScanTuple(const base::Tuple<A>& t1, ScanningResults* results) { |
+ ScanParam(base::get<0>(t1), results); |
} |
template <class A, class B> |
-void ScanTuple(const Tuple<A, B>& t1, ScanningResults* results) { |
- ScanParam(get<0>(t1), results); |
- ScanParam(get<1>(t1), results); |
+void ScanTuple(const base::Tuple<A, B>& t1, ScanningResults* results) { |
+ ScanParam(base::get<0>(t1), results); |
+ ScanParam(base::get<1>(t1), results); |
} |
template <class A, class B, class C> |
-void ScanTuple(const Tuple<A, B, C>& t1, ScanningResults* results) { |
- ScanParam(get<0>(t1), results); |
- ScanParam(get<1>(t1), results); |
- ScanParam(get<2>(t1), results); |
+void ScanTuple(const base::Tuple<A, B, C>& t1, ScanningResults* results) { |
+ ScanParam(base::get<0>(t1), results); |
+ ScanParam(base::get<1>(t1), results); |
+ ScanParam(base::get<2>(t1), results); |
} |
template <class A, class B, class C, class D> |
-void ScanTuple(const Tuple<A, B, C, D>& t1, ScanningResults* results) { |
- ScanParam(get<0>(t1), results); |
- ScanParam(get<1>(t1), results); |
- ScanParam(get<2>(t1), results); |
- ScanParam(get<3>(t1), results); |
+void ScanTuple(const base::Tuple<A, B, C, D>& t1, ScanningResults* results) { |
+ ScanParam(base::get<0>(t1), results); |
+ ScanParam(base::get<1>(t1), results); |
+ ScanParam(base::get<2>(t1), results); |
+ ScanParam(base::get<3>(t1), results); |
} |
template <class MessageType> |
@@ -178,7 +178,8 @@ class MessageScannerImpl { |
: msg_(static_cast<const MessageType*>(msg)) { |
} |
bool ScanMessage(ScanningResults* results) { |
- typename TupleTypes<typename MessageType::Schema::Param>::ValueTuple params; |
+ typename base::TupleTypes<typename MessageType::Schema::Param>::ValueTuple |
+ params; |
if (!MessageType::Read(msg_, ¶ms)) |
return false; |
ScanTuple(params, results); |
@@ -186,8 +187,8 @@ class MessageScannerImpl { |
} |
bool ScanReply(ScanningResults* results) { |
- typename TupleTypes<typename MessageType::Schema::ReplyParam>::ValueTuple |
- params; |
+ typename base::TupleTypes<typename MessageType::Schema::ReplyParam> |
+ ::ValueTuple params; |
if (!MessageType::ReadReplyParam(msg_, ¶ms)) |
return false; |
// If we need to rewrite the message, write the message id first. |