summaryrefslogtreecommitdiff
path: root/chromium/ppapi/proxy/nacl_message_scanner.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2015-06-18 14:10:49 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-18 13:53:24 +0000
commit813fbf95af77a531c57a8c497345ad2c61d475b3 (patch)
tree821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/ppapi/proxy/nacl_message_scanner.cc
parentaf6588f8d723931a298c995fa97259bb7f7deb55 (diff)
downloadqtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/ppapi/proxy/nacl_message_scanner.cc')
-rw-r--r--chromium/ppapi/proxy/nacl_message_scanner.cc28
1 files changed, 14 insertions, 14 deletions
diff --git a/chromium/ppapi/proxy/nacl_message_scanner.cc b/chromium/ppapi/proxy/nacl_message_scanner.cc
index 4120beb7457..a31ba624872 100644
--- a/chromium/ppapi/proxy/nacl_message_scanner.cc
+++ b/chromium/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 Tuple1<A>& t1, ScanningResults* results) {
- ScanParam(t1.a, results);
+void ScanTuple(const Tuple<A>& t1, ScanningResults* results) {
+ ScanParam(get<0>(t1), results);
}
template <class A, class B>
-void ScanTuple(const Tuple2<A, B>& t1, ScanningResults* results) {
- ScanParam(t1.a, results);
- ScanParam(t1.b, results);
+void ScanTuple(const Tuple<A, B>& t1, ScanningResults* results) {
+ ScanParam(get<0>(t1), results);
+ ScanParam(get<1>(t1), results);
}
template <class A, class B, class C>
-void ScanTuple(const Tuple3<A, B, C>& t1, ScanningResults* results) {
- ScanParam(t1.a, results);
- ScanParam(t1.b, results);
- ScanParam(t1.c, results);
+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);
}
template <class A, class B, class C, class D>
-void ScanTuple(const Tuple4<A, B, C, D>& t1, ScanningResults* results) {
- ScanParam(t1.a, results);
- ScanParam(t1.b, results);
- ScanParam(t1.c, results);
- ScanParam(t1.d, results);
+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);
}
template <class MessageType>