diff options
| author | Bertrand SIMONNET <bsimonnet@google.com> | 2015-07-13 17:00:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-13 17:00:39 +0000 |
| commit | 2195afc7463609b2f01978090cf1482c6eae0bbd (patch) | |
| tree | 08e1f50c65c4b5c5b95f8a30874f7e498750a283 | |
| parent | 6676e71f20c1f6987f8ab6bd151d5bbf69371c92 (diff) | |
| parent | 016b98803452aa1bdb4ba9d71d8e50e924e2dad1 (diff) | |
| download | libchrome-2195afc7463609b2f01978090cf1482c6eae0bbd.tar.gz | |
Merge "Make MessageLoopForIO work with -fno-rtti."
| -rw-r--r-- | base/message_loop/message_loop.cc | 2 | ||||
| -rw-r--r-- | base/message_loop/message_loop.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/base/message_loop/message_loop.cc b/base/message_loop/message_loop.cc index b3c895cb58..8ce7d89d1c 100644 --- a/base/message_loop/message_loop.cc +++ b/base/message_loop/message_loop.cc @@ -695,6 +695,8 @@ bool MessageLoopForUI::WatchFileDescriptor( //------------------------------------------------------------------------------ // MessageLoopForIO +MessageLoopForIO::MessageLoopForIO() : MessageLoop(TYPE_IO) {} + #if !defined(OS_NACL_SFI) void MessageLoopForIO::AddIOObserver( MessageLoopForIO::IOObserver* io_observer) { diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h index 2d67fe5180..f26b9ecfa7 100644 --- a/base/message_loop/message_loop.h +++ b/base/message_loop/message_loop.h @@ -618,8 +618,7 @@ COMPILE_ASSERT(sizeof(MessageLoop) == sizeof(MessageLoopForUI), // class BASE_EXPORT MessageLoopForIO : public MessageLoop { public: - MessageLoopForIO() : MessageLoop(TYPE_IO) { - } + MessageLoopForIO(); // Returns the MessageLoopForIO of the current thread. static MessageLoopForIO* current() { |