Index: ipc/param_traits_read_macros.h |
diff --git a/ipc/param_traits_read_macros.h b/ipc/param_traits_read_macros.h |
index a66c89a8d0e5b1cf3e1c13d9d705898997b6e4b9..45e635285a9486710af696c64c3405af8f84e210 100644 |
--- a/ipc/param_traits_read_macros.h |
+++ b/ipc/param_traits_read_macros.h |
@@ -22,25 +22,25 @@ |
#undef IPC_STRUCT_TRAITS_MEMBER |
#undef IPC_STRUCT_TRAITS_PARENT |
#undef IPC_STRUCT_TRAITS_END |
-#define IPC_STRUCT_TRAITS_BEGIN(struct_name) \ |
- bool ParamTraits<struct_name>:: \ |
- Read(const Message* m, base::PickleIterator* iter, param_type* p) { \ |
- return |
+#define IPC_STRUCT_TRAITS_BEGIN(struct_name) \ |
+ bool ParamTraits<struct_name>::Read( \ |
+ const base::Pickle* m, base::PickleIterator* iter, param_type* p) { \ |
+ return |
#define IPC_STRUCT_TRAITS_MEMBER(name) ReadParam(m, iter, &p->name) && |
#define IPC_STRUCT_TRAITS_PARENT(type) ParamTraits<type>::Read(m, iter, p) && |
#define IPC_STRUCT_TRAITS_END() 1; } |
#undef IPC_ENUM_TRAITS_VALIDATE |
-#define IPC_ENUM_TRAITS_VALIDATE(enum_name, validation_expression) \ |
- bool ParamTraits<enum_name>:: \ |
- Read(const Message* m, base::PickleIterator* iter, param_type* p) { \ |
- int value; \ |
- if (!iter->ReadInt(&value)) \ |
- return false; \ |
- if (!(validation_expression)) \ |
- return false; \ |
- *p = static_cast<param_type>(value); \ |
- return true; \ |
+#define IPC_ENUM_TRAITS_VALIDATE(enum_name, validation_expression) \ |
+ bool ParamTraits<enum_name>::Read( \ |
+ const base::Pickle* m, base::PickleIterator* iter, param_type* p) { \ |
+ int value; \ |
+ if (!iter->ReadInt(&value)) \ |
+ return false; \ |
+ if (!(validation_expression)) \ |
+ return false; \ |
+ *p = static_cast<param_type>(value); \ |
+ return true; \ |
} |
#endif // IPC_PARAM_TRAITS_READ_MACROS_H_ |