patch by Jeffrey Yasskin for porting to Ubuntu Hardy. Everything was accepted except there were some bug fixes needed in <locale> for the __nolocale_* series. For the apple branch I ended up using templates instead of the var_args solution because it seemed both safer and more efficient.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@104516 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@@ -148,7 +148,7 @@ timed_mutex::unlock()
|
||||
|
||||
recursive_timed_mutex::recursive_timed_mutex()
|
||||
: __count_(0),
|
||||
__id_(nullptr)
|
||||
__id_(0)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -197,7 +197,7 @@ recursive_timed_mutex::unlock()
|
||||
unique_lock<mutex> lk(__m_);
|
||||
if (--__count_ == 0)
|
||||
{
|
||||
__id_ = nullptr;
|
||||
__id_ = 0;
|
||||
lk.unlock();
|
||||
__cv_.notify_one();
|
||||
}
|
||||
|
Reference in New Issue
Block a user