Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(933)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ipc/ipc_message_macros.h

Issue 669953003: Revert of Standardize usage of virtual/override/final in ipc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_message.h ('k') | ipc/ipc_perftest_support.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_message_macros.h
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h
index 60041559005deeede43bc1e33de135fa3f22f6eb..0978765b993df900978baf03eda2c843b59abfe0 100644
--- a/ipc/ipc_message_macros.h
+++ b/ipc/ipc_message_macros.h
@@ -600,63 +600,66 @@
typedef Schema::Param Param; \
enum { ID = IPC_MESSAGE_ID() }; \
msg_class(IPC_TYPE_IN_##in_cnt in_list); \
- ~msg_class() override; \
+ virtual ~msg_class(); \
static bool Read(const Message* msg, Schema::Param* p); \
static void Log(std::string* name, const Message* msg, std::string* l); \
IPC_ASYNC_MESSAGE_METHODS_##in_cnt \
};
-#define IPC_ASYNC_ROUTED_DECL(msg_class, in_cnt, out_cnt, in_list, out_list) \
- class IPC_MESSAGE_EXPORT msg_class : public IPC::Message { \
- public: \
- typedef IPC::MessageSchema<IPC_TUPLE_IN_##in_cnt in_list> Schema; \
- typedef Schema::Param Param; \
- enum { ID = IPC_MESSAGE_ID() }; \
- msg_class(int32 routing_id \
- IPC_COMMA_##in_cnt IPC_TYPE_IN_##in_cnt in_list); \
- ~msg_class() override; \
- static bool Read(const Message* msg, Schema::Param* p); \
- static void Log(std::string* name, const Message* msg, std::string* l); \
- IPC_ASYNC_MESSAGE_METHODS_##in_cnt \
+#define IPC_ASYNC_ROUTED_DECL(msg_class, in_cnt, out_cnt, in_list, out_list) \
+ class IPC_MESSAGE_EXPORT msg_class : public IPC::Message { \
+ public: \
+ typedef IPC::MessageSchema<IPC_TUPLE_IN_##in_cnt in_list> Schema; \
+ typedef Schema::Param Param; \
+ enum { ID = IPC_MESSAGE_ID() }; \
+ msg_class(int32 routing_id IPC_COMMA_##in_cnt \
+ IPC_TYPE_IN_##in_cnt in_list); \
+ virtual ~msg_class(); \
+ static bool Read(const Message* msg, Schema::Param* p); \
+ static void Log(std::string* name, const Message* msg, std::string* l); \
+ IPC_ASYNC_MESSAGE_METHODS_##in_cnt \
};
-#define IPC_SYNC_CONTROL_DECL(msg_class, in_cnt, out_cnt, in_list, out_list) \
- class IPC_MESSAGE_EXPORT msg_class : public IPC::SyncMessage { \
- public: \
- typedef IPC::SyncMessageSchema<IPC_TUPLE_IN_##in_cnt in_list, \
- IPC_TUPLE_OUT_##out_cnt out_list> Schema; \
- typedef Schema::ReplyParam ReplyParam; \
- typedef Schema::SendParam SendParam; \
- enum { ID = IPC_MESSAGE_ID() }; \
- msg_class(IPC_TYPE_IN_##in_cnt in_list \
- IPC_COMMA_AND_##in_cnt(IPC_COMMA_##out_cnt) \
- IPC_TYPE_OUT_##out_cnt out_list); \
- ~msg_class() override; \
- static bool ReadSendParam(const Message* msg, Schema::SendParam* p); \
- static bool ReadReplyParam(const Message* msg, \
- TupleTypes<ReplyParam>::ValueTuple* p); \
- static void Log(std::string* name, const Message* msg, std::string* l); \
- IPC_SYNC_MESSAGE_METHODS_##out_cnt \
+#define IPC_SYNC_CONTROL_DECL(msg_class, in_cnt, out_cnt, in_list, out_list) \
+ class IPC_MESSAGE_EXPORT msg_class : public IPC::SyncMessage { \
+ public: \
+ typedef IPC::SyncMessageSchema<IPC_TUPLE_IN_##in_cnt in_list, \
+ IPC_TUPLE_OUT_##out_cnt out_list> Schema; \
+ typedef Schema::ReplyParam ReplyParam; \
+ typedef Schema::SendParam SendParam; \
+ enum { ID = IPC_MESSAGE_ID() }; \
+ msg_class(IPC_TYPE_IN_##in_cnt in_list \
+ IPC_COMMA_AND_##in_cnt(IPC_COMMA_##out_cnt) \
+ IPC_TYPE_OUT_##out_cnt out_list); \
+ virtual ~msg_class(); \
+ static bool ReadSendParam(const Message* msg, Schema::SendParam* p); \
+ static bool ReadReplyParam( \
+ const Message* msg, \
+ TupleTypes<ReplyParam>::ValueTuple* p); \
+ static void Log(std::string* name, const Message* msg, std::string* l); \
+ IPC_SYNC_MESSAGE_METHODS_##out_cnt \
};
-#define IPC_SYNC_ROUTED_DECL(msg_class, in_cnt, out_cnt, in_list, out_list) \
- class IPC_MESSAGE_EXPORT msg_class : public IPC::SyncMessage { \
- public: \
- typedef IPC::SyncMessageSchema<IPC_TUPLE_IN_##in_cnt in_list, \
- IPC_TUPLE_OUT_##out_cnt out_list> Schema; \
- typedef Schema::ReplyParam ReplyParam; \
- typedef Schema::SendParam SendParam; \
- enum { ID = IPC_MESSAGE_ID() }; \
- msg_class(int32 routing_id IPC_COMMA_OR_##in_cnt(IPC_COMMA_##out_cnt) \
- IPC_TYPE_IN_##in_cnt in_list \
- IPC_COMMA_AND_##in_cnt(IPC_COMMA_##out_cnt) \
- IPC_TYPE_OUT_##out_cnt out_list); \
- ~msg_class() override; \
- static bool ReadSendParam(const Message* msg, Schema::SendParam* p); \
- static bool ReadReplyParam(const Message* msg, \
- TupleTypes<ReplyParam>::ValueTuple* p); \
- static void Log(std::string* name, const Message* msg, std::string* l); \
- IPC_SYNC_MESSAGE_METHODS_##out_cnt \
+#define IPC_SYNC_ROUTED_DECL(msg_class, in_cnt, out_cnt, in_list, out_list) \
+ class IPC_MESSAGE_EXPORT msg_class : public IPC::SyncMessage { \
+ public: \
+ typedef IPC::SyncMessageSchema<IPC_TUPLE_IN_##in_cnt in_list, \
+ IPC_TUPLE_OUT_##out_cnt out_list> Schema; \
+ typedef Schema::ReplyParam ReplyParam; \
+ typedef Schema::SendParam SendParam; \
+ enum { ID = IPC_MESSAGE_ID() }; \
+ msg_class(int32 routing_id \
+ IPC_COMMA_OR_##in_cnt(IPC_COMMA_##out_cnt) \
+ IPC_TYPE_IN_##in_cnt in_list \
+ IPC_COMMA_AND_##in_cnt(IPC_COMMA_##out_cnt) \
+ IPC_TYPE_OUT_##out_cnt out_list); \
+ virtual ~msg_class(); \
+ static bool ReadSendParam(const Message* msg, Schema::SendParam* p); \
+ static bool ReadReplyParam( \
+ const Message* msg, \
+ TupleTypes<ReplyParam>::ValueTuple* p); \
+ static void Log(std::string* name, const Message* msg, std::string* l); \
+ IPC_SYNC_MESSAGE_METHODS_##out_cnt \
};
#if defined(IPC_MESSAGE_IMPL)
« no previous file with comments | « ipc/ipc_message.h ('k') | ipc/ipc_perftest_support.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698