Merge branch 'hotfix-1.7.1' into develop

This commit is contained in:
Jinhao 2019-07-18 21:41:46 +08:00
commit 6ac558e1b7

View File

@ -141,6 +141,7 @@ namespace threads
::pthread_join(thr->handle, 0); ::pthread_join(thr->handle, 0);
::pthread_detach(thr->handle); ::pthread_detach(thr->handle);
#endif #endif
delete thr;
} }
std::lock_guard<decltype(mutex_)> lock(mutex_); std::lock_guard<decltype(mutex_)> lock(mutex_);