diff options
author | Andrew Cady <d@jerkface.net> | 2022-02-24 19:43:48 -0500 |
---|---|---|
committer | Andrew Cady <d@jerkface.net> | 2022-02-24 19:43:48 -0500 |
commit | 630f77b50285ab70659d3256135bf8bf6a7e1965 (patch) | |
tree | b4e57794049f75cc6f79c3ff130f33b311148240 | |
parent | 4f56fa7ba8e6f632b48c6085a76cd93da21574a0 (diff) |
Revert "try to fix the fallthrough warning"
This reverts commit e247b29913de26abef93de2133bf920bbfcd04f1.
-rw-r--r-- | uthash.h | 29 |
1 files changed, 10 insertions, 19 deletions
@@ -423,15 +423,6 @@ do { | |||
423 | c -= a; c -= b; c ^= ( b >> 15 ); \ | 423 | c -= a; c -= b; c ^= ( b >> 15 ); \ |
424 | } while (0) | 424 | } while (0) |
425 | 425 | ||
426 | #if defined __has_cpp_attribute | ||
427 | #if __has_cpp_attribute(fallthrough) | ||
428 | #define fallthrough ([[fallthrough]];) | ||
429 | #endif | ||
430 | #endif | ||
431 | #ifndef fallthrough | ||
432 | #define fallthrough /* FALL-THRU */ | ||
433 | #endif | ||
434 | |||
435 | #define HASH_JEN(key,keylen,num_bkts,hashv,bkt) \ | 426 | #define HASH_JEN(key,keylen,num_bkts,hashv,bkt) \ |
436 | do { \ | 427 | do { \ |
437 | unsigned _hj_i,_hj_j,_hj_k; \ | 428 | unsigned _hj_i,_hj_j,_hj_k; \ |
@@ -458,25 +449,25 @@ do { | |||
458 | hashv += keylen; \ | 449 | hashv += keylen; \ |
459 | switch ( _hj_k ) { \ | 450 | switch ( _hj_k ) { \ |
460 | case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); \ | 451 | case 11: hashv += ( (unsigned)_hj_key[10] << 24 ); \ |
461 | fallthrough \ | 452 | [[fallthrough]]; \ |
462 | case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); \ | 453 | case 10: hashv += ( (unsigned)_hj_key[9] << 16 ); \ |
463 | fallthrough \ | 454 | [[fallthrough]]; \ |
464 | case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); \ | 455 | case 9: hashv += ( (unsigned)_hj_key[8] << 8 ); \ |
465 | fallthrough \ | 456 | [[fallthrough]]; \ |
466 | case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); \ | 457 | case 8: _hj_j += ( (unsigned)_hj_key[7] << 24 ); \ |
467 | fallthrough \ | 458 | [[fallthrough]]; \ |
468 | case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); \ | 459 | case 7: _hj_j += ( (unsigned)_hj_key[6] << 16 ); \ |
469 | fallthrough \ | 460 | [[fallthrough]]; \ |
470 | case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); \ | 461 | case 6: _hj_j += ( (unsigned)_hj_key[5] << 8 ); \ |
471 | fallthrough \ | 462 | [[fallthrough]]; \ |
472 | case 5: _hj_j += _hj_key[4]; \ | 463 | case 5: _hj_j += _hj_key[4]; \ |
473 | fallthrough \ | 464 | [[fallthrough]]; \ |
474 | case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); \ | 465 | case 4: _hj_i += ( (unsigned)_hj_key[3] << 24 ); \ |
475 | fallthrough \ | 466 | [[fallthrough]]; \ |
476 | case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); \ | 467 | case 3: _hj_i += ( (unsigned)_hj_key[2] << 16 ); \ |
477 | fallthrough \ | 468 | [[fallthrough]]; \ |
478 | case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); \ | 469 | case 2: _hj_i += ( (unsigned)_hj_key[1] << 8 ); \ |
479 | fallthrough \ | 470 | [[fallthrough]]; \ |
480 | case 1: _hj_i += _hj_key[0]; \ | 471 | case 1: _hj_i += _hj_key[0]; \ |
481 | } \ | 472 | } \ |
482 | HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ | 473 | HASH_JEN_MIX(_hj_i, _hj_j, hashv); \ |