diff options
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/ipc_logging.h | 4 | ||||
| -rw-r--r-- | ipc/ipc_sync_channel.h | 10 | ||||
| -rw-r--r-- | ipc/ipc_sync_message.h | 9 |
3 files changed, 10 insertions, 13 deletions
diff --git a/ipc/ipc_logging.h b/ipc/ipc_logging.h index 7bbf18c..364ad79 100644 --- a/ipc/ipc_logging.h +++ b/ipc/ipc_logging.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -30,8 +30,6 @@ class Logging : public base::WaitableEventWatcher::Delegate, class Consumer { public: virtual void Log(const LogData& data) = 0; - protected: - ~Consumer() {} }; void SetConsumer(Consumer* consumer); diff --git a/ipc/ipc_sync_channel.h b/ipc/ipc_sync_channel.h index 741959f..bfc9eac 100644 --- a/ipc/ipc_sync_channel.h +++ b/ipc/ipc_sync_channel.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef IPC_IPC_SYNC_SENDER_H_ -#define IPC_IPC_SYNC_SENDER_H_ +#ifndef IPC_IPC_SYNC_SENDER_H__ +#define IPC_IPC_SYNC_SENDER_H__ #include <string> #include <deque> @@ -154,9 +154,9 @@ class SyncChannel : public ChannelProxy, base::WaitableEventWatcher send_done_watcher_; base::WaitableEventWatcher dispatch_watcher_; - DISALLOW_COPY_AND_ASSIGN(SyncChannel); + DISALLOW_EVIL_CONSTRUCTORS(SyncChannel); }; } // namespace IPC -#endif // IPC_IPC_SYNC_SENDER_H_ +#endif // IPC_IPC_SYNC_SENDER_H__ diff --git a/ipc/ipc_sync_message.h b/ipc/ipc_sync_message.h index 092fda2..5d072a7 100644 --- a/ipc/ipc_sync_message.h +++ b/ipc/ipc_sync_message.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef IPC_IPC_SYNC_MESSAGE_H_ -#define IPC_IPC_SYNC_MESSAGE_H_ +#ifndef IPC_IPC_SYNC_MESSAGE_H__ +#define IPC_IPC_SYNC_MESSAGE_H__ #if defined(OS_WIN) #include <windows.h> @@ -84,7 +84,6 @@ class SyncMessage : public Message { // Used to deserialize parameters from a reply to a synchronous message class MessageReplyDeserializer { public: - virtual ~MessageReplyDeserializer() {} bool SerializeOutputParameters(const Message& msg); private: // Derived classes need to implement this, using the given iterator (which @@ -94,4 +93,4 @@ class MessageReplyDeserializer { } // namespace IPC -#endif // IPC_IPC_SYNC_MESSAGE_H_ +#endif // IPC_IPC_SYNC_MESSAGE_H__ |