projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d4e2aa0
)
Fixed noexcept args
author
khizmax
<libcds.dev@gmail.com>
Fri, 11 Dec 2015 05:53:04 +0000
(08:53 +0300)
committer
khizmax
<libcds.dev@gmail.com>
Fri, 11 Dec 2015 05:53:04 +0000
(08:53 +0300)
cds/sync/spinlock.h
patch
|
blob
|
history
diff --git
a/cds/sync/spinlock.h
b/cds/sync/spinlock.h
index 661e2386764fdd97d97403f643221ff73b906acd..b1dfe82810e9168ccb1e102a797e65ee0075c518 100644
(file)
--- a/
cds/sync/spinlock.h
+++ b/
cds/sync/spinlock.h
@@
-287,7
+287,7
@@
namespace cds {
}
/// Try to lock the object
}
/// Try to lock the object
- bool try_lock( unsigned int nTryCount ) CDS_NOEXCEPT_( noexcept( try_acquire( nTryCount )))
+ bool try_lock( unsigned int nTryCount ) CDS_NOEXCEPT_( noexcept(
std::declval<reentrant_spin_lock>().
try_acquire( nTryCount )))
{
thread_id tid = OS::get_current_thread_id();
if ( try_taken_lock( tid ) )
{
thread_id tid = OS::get_current_thread_id();
if ( try_taken_lock( tid ) )
@@
-300,7
+300,7
@@
namespace cds {
}
/// Lock the object waits if it is busy
}
/// Lock the object waits if it is busy
- void lock() CDS_NOEXCEPT_( noexcept( acquire()))
+ void lock() CDS_NOEXCEPT_( noexcept(
std::declval<reentrant_spin_lock>().
acquire()))
{
thread_id tid = OS::get_current_thread_id();
if ( !try_taken_lock( tid ) ) {
{
thread_id tid = OS::get_current_thread_id();
if ( !try_taken_lock( tid ) ) {