alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bricks: add support for gcc prior to 4.9

Browse source 
* bricks/brick-bitlevel, bricks/brick-hashset,
bricks/brick-shmem, bricks/brick-types: here.
This commit is contained in:
Etienne Renault 2016-12-06 15:35:51 +01:00
parent 6c5c308ea8
commit a308d1a60a
4 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bricks/brick-bitlevel
View file

@ -88,7 +88,10 @@ struct bvpair
constexpr bvpair( L l, H h = 0 ) : low( l ), high( h ) {} constexpr bvpair( L l, H h = 0 ) : low( l ), high( h ) {}
constexpr bvpair() = default; constexpr bvpair() = default;
explicit constexpr operator bool() const { return low || high; } explicit constexpr operator bool() const { return low || high; }
constexpr bvpair operator<<( int s ) const #if ((__GNUC__ >= 4 && __GNUC_MINOR__ > 9) || (__clang_major__ == 3 && __clang_minor__ >= 6))
constexpr
#endif
bvpair operator<<( int s ) const
{ {
int rem = 8 * sizeof( low ) - s; int rem = 8 * sizeof( low ) - s;
int unshift = std::max( rem, 0 ); int unshift = std::max( rem, 0 );
@ -96,7 +99,10 @@ struct bvpair
H carry = ( low & ~ones< L >( unshift ) ) >> unshift; H carry = ( low & ~ones< L >( unshift ) ) >> unshift;
return bvpair( low << s, ( high << s ) | ( carry << shift ) ); return bvpair( low << s, ( high << s ) | ( carry << shift ) );
} }
constexpr bvpair operator>>( int s ) const #if ((__GNUC__ >= 4 && __GNUC_MINOR__ > 9) || (__clang_major__ == 3 && __clang_minor__ >= 6))
constexpr
#endif
bvpair operator>>( int s ) const
{ {
int rem = 8 * sizeof( low ) - s; int rem = 8 * sizeof( low ) - s;
int unshift = std::max( rem, 0 ); int unshift = std::max( rem, 0 );

2
bricks/brick-hashset
View file

@ -43,7 +43,7 @@ using hash::hash128_t;
struct DefaultHasher struct DefaultHasher
{ {
auto hash( int64_t v ) const auto hash( int64_t v ) const -> std::pair<int64_t, int64_t>
{ {
return std::make_pair( v, ~v ); return std::make_pair( v, ~v );
} }

4
bricks/brick-shmem
View file

@ -188,7 +188,7 @@ struct AsyncLoop : Thread< LoopWrapper< T > >
}; };
template< typename L > template< typename L >
auto async_loop( L &&l ) auto async_loop( L &&l ) -> AsyncLoop< LambdaWrapper< L > >&&
{ {
AsyncLoop< LambdaWrapper< L > > al( std::forward< L >( l ) ); AsyncLoop< LambdaWrapper< L > > al( std::forward< L >( l ) );
al._start_on_move = true; al._start_on_move = true;
@ -196,7 +196,7 @@ auto async_loop( L &&l )
} }
template< typename L > template< typename L >
auto thread( L &&l ) auto thread( L &&l ) -> Thread< LambdaWrapper< L > >
{ {
Thread< LambdaWrapper< L > > thr( std::forward< L >( l ) ); Thread< LambdaWrapper< L > > thr( std::forward< L >( l ) );
thr._start_on_move = true; thr._start_on_move = true;

5
bricks/brick-types
View file

@ -533,9 +533,10 @@ struct Union : Comparable {
return _discriminator == 0; return _discriminator == 0;
} }
template< typename T >
explicit operator bool() const explicit operator bool() const
{ {
auto rv = const_cast< Union* >( this )->apply( []( const auto & x ) -> bool { return !!x; } ); auto rv = const_cast< Union* >( this )->apply( []( const T & x ) -> bool { return !!x; } );
if ( rv.isNothing() ) if ( rv.isNothing() )
return false; return false;
return true; return true;
@ -1385,6 +1386,7 @@ struct StrongEnumFlagsTest {
ASSERT( !e1 ); ASSERT( !e1 );
ASSERT( e2 ); ASSERT( e2 );
#if ((__GNUC__ >= 4 && __GNUC_MINOR__ > 9) || (__clang_major__ == 3 && __clang_minor__ >= 6))
ASSERT( e1 | e2 ); ASSERT( e1 | e2 );
ASSERT( Enum::X | Enum::Y ); ASSERT( Enum::X | Enum::Y );
ASSERT( e2 | Enum::Z ); ASSERT( e2 | Enum::Z );
@ -1396,6 +1398,7 @@ struct StrongEnumFlagsTest {
ASSERT( Enum::X | Enum::Y | Enum::Z ); ASSERT( Enum::X | Enum::Y | Enum::Z );
ASSERT( !( Enum::X & Enum::Y & Enum::Z ) ); ASSERT( !( Enum::X & Enum::Y & Enum::Z ) );
ASSERT( ( Enum::X | Enum::Y | Enum::Z ) & Enum::X ); ASSERT( ( Enum::X | Enum::Y | Enum::Z ) & Enum::X );
#endif
} }
// we don't want to break classical enums and ints by out operators // we don't want to break classical enums and ints by out operators