Index: chrome/common/safe_browsing/protobuf_message_read_macros.h |
diff --git a/chrome/common/safe_browsing/protobuf_message_read_macros.h b/chrome/common/safe_browsing/protobuf_message_read_macros.h |
index 57c70af7f028fc2bfbb755af471f8731c8cdcbeb..aba946fb99b48c11281cedb7417551bb4877d598 100644 |
--- a/chrome/common/safe_browsing/protobuf_message_read_macros.h |
+++ b/chrome/common/safe_browsing/protobuf_message_read_macros.h |
@@ -15,19 +15,21 @@ |
#undef IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER |
#undef IPC_PROTOBUF_MESSAGE_TRAITS_END |
-#define IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN(message_name) \ |
- template <class P> \ |
- bool ParamTraits<message_name>::ReadParamF( \ |
- const Message* m, PickleIterator* iter, param_type* p, \ |
- void (param_type::*setter_function)(P)) { \ |
- P value; \ |
- if (!ReadParam(m, iter, &value)) \ |
- return false; \ |
- (p->*setter_function)(value); \ |
- return true; \ |
- } \ |
- bool ParamTraits<message_name>::Read(const Message* m, PickleIterator* iter, \ |
+#define IPC_PROTOBUF_MESSAGE_TRAITS_BEGIN(message_name) \ |
+ template <class P> \ |
+ bool ParamTraits<message_name>::ReadParamF( \ |
+ const Message* m, base::PickleIterator* iter, param_type* p, \ |
+ void (param_type::*setter_function)(P)) { \ |
+ P value; \ |
+ if (!ReadParam(m, iter, &value)) \ |
+ return false; \ |
+ (p->*setter_function)(value); \ |
+ return true; \ |
+ } \ |
+ bool ParamTraits<message_name>::Read(const Message* m, \ |
+ base::PickleIterator* iter, \ |
param_type* p) { |
+ |
#define IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_FUNDAMENTAL_MEMBER(name) \ |
{ \ |
bool is_present; \ |
@@ -38,6 +40,7 @@ |
else if (!ReadParamF(m, iter, p, ¶m_type::set_##name)) \ |
return false; \ |
} |
+ |
#define IPC_PROTOBUF_MESSAGE_TRAITS_OPTIONAL_COMPLEX_MEMBER(name) \ |
{ \ |
bool is_present; \ |
@@ -48,9 +51,11 @@ |
else if (!ReadParam(m, iter, p->mutable_##name())) \ |
return false; \ |
} |
+ |
#define IPC_PROTOBUF_MESSAGE_TRAITS_REPEATED_COMPLEX_MEMBER(name) \ |
if (!ReadParam(m, iter, p->mutable_##name())) \ |
return false; |
+ |
#define IPC_PROTOBUF_MESSAGE_TRAITS_END() \ |
return true; \ |
} |