diff options
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/auto_thread.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/base/auto_thread.cc b/remoting/base/auto_thread.cc index 9890bc3..d79af49 100644 --- a/remoting/base/auto_thread.cc +++ b/remoting/base/auto_thread.cc @@ -92,7 +92,7 @@ AutoThread::AutoThread(const char* name) #if defined(OS_WIN) com_init_type_(COM_INIT_NONE), #endif - thread_(), + thread_(0), name_(name), was_quit_properly_(false) { } @@ -102,7 +102,7 @@ AutoThread::AutoThread(const char* name, AutoThreadTaskRunner* joiner) #if defined(OS_WIN) com_init_type_(COM_INIT_NONE), #endif - thread_(), + thread_(0), name_(name), was_quit_properly_(false), joiner_(joiner) { @@ -112,14 +112,14 @@ AutoThread::~AutoThread() { DCHECK(!startup_data_); // Wait for the thread to exit. - if (!thread_.is_null()) { + if (thread_) { base::PlatformThread::Join(thread_); } } scoped_refptr<AutoThreadTaskRunner> AutoThread::StartWithType( base::MessageLoop::Type type) { - DCHECK(thread_.is_null()); + DCHECK(!thread_); #if defined(OS_WIN) DCHECK(com_init_type_ != COM_INIT_STA || type == base::MessageLoop::TYPE_UI); #endif |