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

bricks: propagate use of SPOT_FALLTHROUGH

Browse source 
* bricks/brick-hash.h, bricks/brick-hashset.h: here.
This commit is contained in:
Etienne Renault 2016-10-26 08:52:23 +02:00
parent fb4ef40d11
commit ae1a3601e6
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
bricks/brick-hash.h
View file

@ -29,6 +29,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. */ * POSSIBILITY OF SUCH DAMAGE. */
#include <spot/misc/common.hh>
#include <bricks/brick-assert.h> #include <bricks/brick-assert.h>
#include <cstddef> #include <cstddef>
@ -572,37 +574,48 @@ private:
switch (remainder) switch (remainder)
{ {
case 15: case 15:
d += uint64( u.p8[14] ) << 48; d += uint64( u.p8[14] ) << 48;
SPOT_FALLTHROUGH;
case 14: case 14:
d += uint64( u.p8[13] ) << 40; d += uint64( u.p8[13] ) << 40;
SPOT_FALLTHROUGH;
case 13: case 13:
d += uint64( u.p8[12] ) << 32; d += uint64( u.p8[12] ) << 32;
SPOT_FALLTHROUGH;
case 12: case 12:
d += u.p32[2]; d += u.p32[2];
c += u.p64[0]; c += u.p64[0];
break; break;
case 11: case 11:
d += uint64( u.p8[10] ) << 16; d += uint64( u.p8[10] ) << 16;
SPOT_FALLTHROUGH;
case 10: case 10:
d += uint64( u.p8[9] ) << 8; d += uint64( u.p8[9] ) << 8;
SPOT_FALLTHROUGH;
case 9: case 9:
d += uint64( u.p8[8] ); d += uint64( u.p8[8] );
SPOT_FALLTHROUGH;
case 8: case 8:
c += u.p64[0]; c += u.p64[0];
break; break;
case 7: case 7:
c += uint64(u.p8[6] ) << 48; c += uint64(u.p8[6] ) << 48;
SPOT_FALLTHROUGH;
case 6: case 6:
c += uint64( u.p8[5] ) << 40; c += uint64( u.p8[5] ) << 40;
SPOT_FALLTHROUGH;
case 5: case 5:
c += uint64( u.p8[4] ) << 32; c += uint64( u.p8[4] ) << 32;
SPOT_FALLTHROUGH;
case 4: case 4:
c += u.p32[0]; c += u.p32[0];
break; break;
case 3: case 3:
c += uint64( u.p8[2] ) << 16; c += uint64( u.p8[2] ) << 16;
SPOT_FALLTHROUGH;
case 2: case 2:
c += uint64( u.p8[1] ) << 8; c += uint64( u.p8[1] ) << 8;
SPOT_FALLTHROUGH;
case 1: case 1:
c += uint64( u.p8[0] ); c += uint64( u.p8[0] );
break; break;

3
bricks/brick-hashset.h
View file

@ -32,6 +32,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. */ * POSSIBILITY OF SUCH DAMAGE. */
#include <spot/misc/common.hh>
#include <bricks/brick-hash.h> #include <bricks/brick-hash.h>
#include <bricks/brick-shmem.h> #include <bricks/brick-shmem.h>
#include <bricks/brick-bitlevel.h> #include <bricks/brick-bitlevel.h>
@ -636,6 +638,7 @@ struct _ConcurrentHashSet : HashSetBase< Cell >
++_td.currentRow; ++_td.currentRow;
break; break;
} }
SPOT_FALLTHROUGH;
case Resolution::Growing: case Resolution::Growing:
helpWithRehashing(); helpWithRehashing();
updateIndex( _td.currentRow ); updateIndex( _td.currentRow );