OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef IPC_PARAM_TRAITS_READ_MACROS_H_ | 5 #ifndef IPC_PARAM_TRAITS_READ_MACROS_H_ |
6 #define IPC_PARAM_TRAITS_READ_MACROS_H_ | 6 #define IPC_PARAM_TRAITS_READ_MACROS_H_ |
7 | 7 |
8 // Null out all the macros that need nulling. | 8 // Null out all the macros that need nulling. |
9 #include "ipc/ipc_message_null_macros.h" | 9 #include "ipc/ipc_message_null_macros.h" |
10 | 10 |
(...skipping 17 matching lines...) Expand all Loading... |
28 return | 28 return |
29 #define IPC_STRUCT_TRAITS_MEMBER(name) ReadParam(m, iter, &p->name) && | 29 #define IPC_STRUCT_TRAITS_MEMBER(name) ReadParam(m, iter, &p->name) && |
30 #define IPC_STRUCT_TRAITS_PARENT(type) ParamTraits<type>::Read(m, iter, p) && | 30 #define IPC_STRUCT_TRAITS_PARENT(type) ParamTraits<type>::Read(m, iter, p) && |
31 #define IPC_STRUCT_TRAITS_END() 1; } | 31 #define IPC_STRUCT_TRAITS_END() 1; } |
32 | 32 |
33 #undef IPC_ENUM_TRAITS_VALIDATE | 33 #undef IPC_ENUM_TRAITS_VALIDATE |
34 #define IPC_ENUM_TRAITS_VALIDATE(enum_name, validation_expression) \ | 34 #define IPC_ENUM_TRAITS_VALIDATE(enum_name, validation_expression) \ |
35 bool ParamTraits<enum_name>:: \ | 35 bool ParamTraits<enum_name>:: \ |
36 Read(const Message* m, PickleIterator* iter, param_type* p) { \ | 36 Read(const Message* m, PickleIterator* iter, param_type* p) { \ |
37 int value; \ | 37 int value; \ |
38 if (!m->ReadInt(iter, &value)) \ | 38 if (!iter->ReadInt(&value)) \ |
39 return false; \ | 39 return false; \ |
40 if (!(validation_expression)) \ | 40 if (!(validation_expression)) \ |
41 return false; \ | 41 return false; \ |
42 *p = static_cast<param_type>(value); \ | 42 *p = static_cast<param_type>(value); \ |
43 return true; \ | 43 return true; \ |
44 } | 44 } |
45 | 45 |
46 #endif // IPC_PARAM_TRAITS_READ_MACROS_H_ | 46 #endif // IPC_PARAM_TRAITS_READ_MACROS_H_ |
47 | 47 |
OLD | NEW |