From f21b73145323e906b5f245018444c775e74d0f67 Mon Sep 17 00:00:00 2001 From: khizmax Date: Sat, 12 Nov 2016 12:02:58 +0300 Subject: [PATCH] Removed trailing spaces --- cds/intrusive/details/split_list_base.h | 12 ++++++------ cds/intrusive/impl/iterable_list.h | 2 +- .../intrusive-set/test_intrusive_feldman_hashset.h | 4 ++-- test/unit/map/feldman_hashmap_dhp.cpp | 4 ++-- test/unit/map/feldman_hashmap_hp.cpp | 4 ++-- test/unit/map/test_feldman_hashmap.h | 4 ++-- test/unit/map/test_feldman_hashmap_rcu.h | 4 ++-- test/unit/set/test_feldman_hashset.h | 6 +++--- 8 files changed, 20 insertions(+), 20 deletions(-) diff --git a/cds/intrusive/details/split_list_base.h b/cds/intrusive/details/split_list_base.h index 5e68bc83..6546e495 100644 --- a/cds/intrusive/details/split_list_base.h +++ b/cds/intrusive/details/split_list_base.h @@ -970,12 +970,12 @@ namespace cds { namespace intrusive { if ( n1->m_nHash != n2->m_nHash ) return n1->m_nHash < n2->m_nHash ? -1 : 1; - if ( n1->is_dummy() ) { - assert( n2->is_dummy() ); + if ( n1->is_dummy()) { + assert( n2->is_dummy()); return 0; } - assert( !n1->is_dummy() && !n2->is_dummy() ); + assert( !n1->is_dummy() && !n2->is_dummy()); return native_key_comparator()( lhs, rhs ); } @@ -1117,12 +1117,12 @@ namespace cds { namespace intrusive { if ( n1.m_nHash != n2.m_nHash ) return n1.m_nHash < n2.m_nHash ? -1 : 1; - if ( n1.is_dummy() ) { - assert( n2.is_dummy() ); + if ( n1.is_dummy()) { + assert( n2.is_dummy()); return 0; } - assert( !n1.is_dummy() && !n2.is_dummy() ); + assert( !n1.is_dummy() && !n2.is_dummy()); return base_class()( lhs, rhs ); } diff --git a/cds/intrusive/impl/iterable_list.h b/cds/intrusive/impl/iterable_list.h index 5ef08b1a..9ef5cf10 100644 --- a/cds/intrusive/impl/iterable_list.h +++ b/cds/intrusive/impl/iterable_list.h @@ -1415,7 +1415,7 @@ namespace cds { namespace intrusive { while ( true ) { node_type * pCur = pPrev->next.load( memory_model::memory_order_relaxed ); - if ( pCur == pCur->next.load( memory_model::memory_order_acquire ) ) { + if ( pCur == pCur->next.load( memory_model::memory_order_acquire )) { // end-of-list return pPrev; } diff --git a/test/unit/intrusive-set/test_intrusive_feldman_hashset.h b/test/unit/intrusive-set/test_intrusive_feldman_hashset.h index da71af1c..c545a9fe 100644 --- a/test/unit/intrusive-set/test_intrusive_feldman_hashset.h +++ b/test/unit/intrusive-set/test_intrusive_feldman_hashset.h @@ -59,7 +59,7 @@ namespace cds_test { void clear_stat() { - memset( this, 0, sizeof( *this ) ); + memset( this, 0, sizeof( *this )); } }; @@ -194,7 +194,7 @@ namespace cds_test { struct cmp2 { int operator ()( key_val const& lhs, key_val const& rhs ) const { - if ( lhs.key() < rhs.key() ) + if ( lhs.key() < rhs.key()) return -1; return lhs.key() > rhs.key() ? 1 : 0; } diff --git a/test/unit/map/feldman_hashmap_dhp.cpp b/test/unit/map/feldman_hashmap_dhp.cpp index c40613c6..26cc1636 100644 --- a/test/unit/map/feldman_hashmap_dhp.cpp +++ b/test/unit/map/feldman_hashmap_dhp.cpp @@ -143,8 +143,8 @@ namespace { typedef cc::FeldmanHashMap< gc_type, key_type2, value_type, map_traits > map_type; map_type m( 5, 3 ); - EXPECT_EQ( m.head_size(), static_cast(1 << 6) ); - EXPECT_EQ( m.array_node_size(), static_cast(1 << 3) ); + EXPECT_EQ( m.head_size(), static_cast(1 << 6)); + EXPECT_EQ( m.array_node_size(), static_cast(1 << 3)); test( m ); } diff --git a/test/unit/map/feldman_hashmap_hp.cpp b/test/unit/map/feldman_hashmap_hp.cpp index 5f5d09a6..d462339e 100644 --- a/test/unit/map/feldman_hashmap_hp.cpp +++ b/test/unit/map/feldman_hashmap_hp.cpp @@ -153,8 +153,8 @@ namespace { typedef cc::FeldmanHashMap< gc_type, key_type2, value_type, map_traits > map_type; map_type m( 5, 3 ); - EXPECT_EQ( m.head_size(), static_cast(1 << 6) ); - EXPECT_EQ( m.array_node_size(), static_cast(1 << 3) ); + EXPECT_EQ( m.head_size(), static_cast(1 << 6)); + EXPECT_EQ( m.array_node_size(), static_cast(1 << 3)); test( m ); } diff --git a/test/unit/map/test_feldman_hashmap.h b/test/unit/map/test_feldman_hashmap.h index 0d458353..cf567d60 100644 --- a/test/unit/map/test_feldman_hashmap.h +++ b/test/unit/map/test_feldman_hashmap.h @@ -60,7 +60,7 @@ namespace cds_test { {} explicit key_type2( std::string const& str ) - : nKey( std::stoi( str ) ) + : nKey( std::stoi( str )) , subkey( nKey ) {} @@ -140,7 +140,7 @@ namespace cds_test { struct hash2 { key_type2 operator()( int i ) const { - return key_type2( cds::opt::v::hash()(i) ); + return key_type2( cds::opt::v::hash()(i)); } key_type2 operator()( std::string const& str ) const diff --git a/test/unit/map/test_feldman_hashmap_rcu.h b/test/unit/map/test_feldman_hashmap_rcu.h index 596f9771..27e3ae0e 100644 --- a/test/unit/map/test_feldman_hashmap_rcu.h +++ b/test/unit/map/test_feldman_hashmap_rcu.h @@ -292,8 +292,8 @@ namespace { typedef cc::FeldmanHashMap< rcu_type, key_type2, value_type, map_traits > map_type; map_type m( 5, 3 ); - EXPECT_EQ( m.head_size(), static_cast(1 << 6) ); - EXPECT_EQ( m.array_node_size(), static_cast(1 << 3) ); + EXPECT_EQ( m.head_size(), static_cast(1 << 6)); + EXPECT_EQ( m.array_node_size(), static_cast(1 << 3)); this->test( m ); } diff --git a/test/unit/set/test_feldman_hashset.h b/test/unit/set/test_feldman_hashset.h index a7d88bbd..b03f3838 100644 --- a/test/unit/set/test_feldman_hashset.h +++ b/test/unit/set/test_feldman_hashset.h @@ -186,7 +186,7 @@ namespace cds_test { int_item2( int k, std::string&& s ) : key_val( k, k * 2 ) - , strVal( std::move( s ) ) + , strVal( std::move( s )) {} explicit int_item2( other_item const& s ) @@ -220,7 +220,7 @@ namespace cds_test { key_val operator()( other_item const& i ) const { - return key_val( i.key() ); + return key_val( i.key()); } key_val operator()( int i ) const @@ -270,7 +270,7 @@ namespace cds_test { struct cmp2 { int operator ()( key_val const& v1, key_val const& v2 ) const { - if ( v1.key() < v2.key() ) + if ( v1.key() < v2.key()) return -1; return v1.key() > v2.key() ? 1 : 0; } -- 2.34.1