diff options
| author | Chenhao Qu <chenhao.qu@mongodb.com> | 2022-07-27 11:34:26 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-07-27 02:06:32 +0000 |
| commit | 4c9eaf61d71f7d2d529aa669731e486d1788fcf3 (patch) | |
| tree | 9bd2e27880276453eb4a0831b959c847f3150b22 /src | |
| parent | f5ecae039eb5907378b55535b2facbc4ac7ee90f (diff) | |
| download | mongo-4c9eaf61d71f7d2d529aa669731e486d1788fcf3.tar.gz | |
Import wiredtiger: 8b16413a34868c49a782a4cfc17fcdc02bccb172 from branch mongodb-master
ref: 82e99d54c4..8b16413a34
for: 6.1.0-rc0
WT-9637 Fix gcc-11 strict compilation error of int to unsigned short conversion (#8141)
Diffstat (limited to 'src')
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/include/hardware.h | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index bdfce919c3c..e8be4e70408 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "82e99d54c44e49b53586f1c8b80d44c5dde5acdf" + "commit": "8b16413a34868c49a782a4cfc17fcdc02bccb172" } diff --git a/src/third_party/wiredtiger/src/include/hardware.h b/src/third_party/wiredtiger/src/include/hardware.h index 753874fd87f..1c7a15be6b7 100644 --- a/src/third_party/wiredtiger/src/include/hardware.h +++ b/src/third_party/wiredtiger/src/include/hardware.h @@ -41,14 +41,14 @@ } while (!__wt_atomic_cas16(&(p)->flags_atomic, __orig, __orig | (uint16_t)(mask))); \ } while (0) -#define F_CLR_ATOMIC_16(p, mask) \ - do { \ - uint16_t __orig; \ - if (!F_ISSET_ATOMIC_16(p, mask)) \ - break; \ - do { \ - __orig = (p)->flags_atomic; \ - } while (!__wt_atomic_cas16(&(p)->flags_atomic, __orig, __orig & ~(uint16_t)(mask))); \ +#define F_CLR_ATOMIC_16(p, mask) \ + do { \ + uint16_t __orig; \ + if (!F_ISSET_ATOMIC_16(p, mask)) \ + break; \ + do { \ + __orig = (p)->flags_atomic; \ + } while (!__wt_atomic_cas16(&(p)->flags_atomic, __orig, __orig & (uint16_t)(~(mask)))); \ } while (0) /* |