OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_LOG_MACROS_H_ | 5 #ifndef IPC_PARAM_TRAITS_LOG_MACROS_H_ |
6 #define IPC_PARAM_TRAITS_LOG_MACROS_H_ | 6 #define IPC_PARAM_TRAITS_LOG_MACROS_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 // Null out all the macros that need nulling. | 10 // Null out all the macros that need nulling. |
11 #include "ipc/ipc_message_null_macros.h" | 11 #include "ipc/ipc_message_null_macros.h" |
12 | 12 |
13 // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. | 13 // STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. |
14 #undef IPC_STRUCT_BEGIN | 14 #undef IPC_STRUCT_BEGIN |
15 #undef IPC_STRUCT_MEMBER | 15 #undef IPC_STRUCT_MEMBER |
16 #undef IPC_STRUCT_END | 16 #undef IPC_STRUCT_END |
17 #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) | 17 #define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) |
18 #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) | 18 #define IPC_STRUCT_MEMBER(type, name) IPC_STRUCT_TRAITS_MEMBER(name) |
19 #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() | 19 #define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() |
20 | 20 |
21 // Set up so next include will generate log methods. | 21 // Set up so next include will generate log methods. |
22 #undef IPC_STRUCT_TRAITS_BEGIN | 22 #undef IPC_STRUCT_TRAITS_BEGIN |
23 #undef IPC_STRUCT_TRAITS_MEMBER | 23 #undef IPC_STRUCT_TRAITS_MEMBER |
| 24 #undef IPC_STRUCT_TRAITS_PARENT |
24 #undef IPC_STRUCT_TRAITS_END | 25 #undef IPC_STRUCT_TRAITS_END |
25 #define IPC_STRUCT_TRAITS_BEGIN(struct_name) \ | 26 #define IPC_STRUCT_TRAITS_BEGIN(struct_name) \ |
26 void ParamTraits<struct_name>::Log(const param_type& p, std::string* l) { \ | 27 void ParamTraits<struct_name>::Log(const param_type& p, std::string* l) { \ |
27 bool needs_comma = false; \ | 28 bool needs_comma = false; \ |
28 l->append("("); | 29 l->append("("); |
29 #define IPC_STRUCT_TRAITS_MEMBER(name) \ | 30 #define IPC_STRUCT_TRAITS_MEMBER(name) \ |
30 if (needs_comma) \ | 31 if (needs_comma) \ |
31 l->append(", "); \ | 32 l->append(", "); \ |
32 LogParam(p.name, l); \ | 33 LogParam(p.name, l); \ |
33 needs_comma = true; | 34 needs_comma = true; |
| 35 #define IPC_STRUCT_TRAITS_PARENT(type) \ |
| 36 if (needs_comma) \ |
| 37 l->append(", "); \ |
| 38 ParamTraits<type>::Log(p, l); \ |
| 39 needs_comma = true; |
34 #define IPC_STRUCT_TRAITS_END() \ | 40 #define IPC_STRUCT_TRAITS_END() \ |
35 l->append(")"); \ | 41 l->append(")"); \ |
36 } | 42 } |
37 | 43 |
38 #undef IPC_ENUM_TRAITS | 44 #undef IPC_ENUM_TRAITS |
39 #define IPC_ENUM_TRAITS(enum_name) \ | 45 #define IPC_ENUM_TRAITS(enum_name) \ |
40 void ParamTraits<enum_name>::Log(const param_type& p, std::string* l) { \ | 46 void ParamTraits<enum_name>::Log(const param_type& p, std::string* l) { \ |
41 LogParam(static_cast<int>(p), l); \ | 47 LogParam(static_cast<int>(p), l); \ |
42 } | 48 } |
43 | 49 |
44 #endif // IPC_PARAM_TRAITS_LOG_MACROS_H_ | 50 #endif // IPC_PARAM_TRAITS_LOG_MACROS_H_ |
45 | 51 |
OLD | NEW |