From: khizmax Date: Wed, 3 Jun 2015 19:41:23 +0000 (+0300) Subject: typo fixed X-Git-Tag: v2.1.0~216 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=c83533892fbdb2785ab71d594f12447533f3db94;p=libcds.git typo fixed --- diff --git a/.gitignore b/.gitignore index ac8c22be..1b5d9a11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ /tools/doxygen.log /doc +/sandbox /projects/Win/vc12/cds.opensdf /projects/Win/vc12/cds.sdf /projects/Win/vc12/cds.v12.suo diff --git a/cds/container/split_list_set_rcu.h b/cds/container/split_list_set_rcu.h index 6b7aa3ae..f563e1fd 100644 --- a/cds/container/split_list_set_rcu.h +++ b/cds/container/split_list_set_rcu.h @@ -47,7 +47,7 @@ namespace cds { namespace container { public: typedef cds::urcu::raw_ptr_adaptor< value_type, intrusive_raw_ptr, raw_ptr_converter > raw_ptr; - static raw_ptr make( typename intrusive_raw_ptr&& p ) + static raw_ptr make( intrusive_raw_ptr&& p ) { return raw_ptr(std::move( p )); } diff --git a/cds/intrusive/details/raw_ptr_disposer.h b/cds/intrusive/details/raw_ptr_disposer.h index c76fbc43..d2dfc737 100644 --- a/cds/intrusive/details/raw_ptr_disposer.h +++ b/cds/intrusive/details/raw_ptr_disposer.h @@ -46,9 +46,11 @@ namespace cds { namespace intrusive { namespace details { assert( pReclaimedChain == nullptr ); pReclaimedChain = d.pReclaimedChain; d.pReclaimedChain = nullptr; - retur *this; + return *this; } + raw_ptr_disposer& operator=(raw_ptr_disposer const& d) = delete; + void apply() { if ( pReclaimedChain ) { diff --git a/cds/urcu/details/sig_buffered.h b/cds/urcu/details/sig_buffered.h index a938b226..05b98623 100644 --- a/cds/urcu/details/sig_buffered.h +++ b/cds/urcu/details/sig_buffered.h @@ -108,7 +108,7 @@ namespace cds { namespace urcu { p.free(); } else { - push_buffer( p ); + push_buffer( std::move(p) ); break; } }