diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2023-01-05 12:53:42 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-01-05 02:35:30 +0000 |
| commit | 501e5cfb6ea27314e31f2d4945f30ead5d693eb3 (patch) | |
| tree | 3dc182587c46982becdbe2701139cae61646fcb1 | |
| parent | 34c3c8eb005f58da7bf733639eab49251206bd53 (diff) | |
| download | mongo-501e5cfb6ea27314e31f2d4945f30ead5d693eb3.tar.gz | |
Import wiredtiger: fa3e9c76e29619bc596218ac43a26575b2f3fd4e from branch mongodb-6.0
ref: b53bacaa4e..fa3e9c76e2
for: 6.0.4
WT-9637 Fix gcc-11 strict compilation error of int to unsigned short conversion
| -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 f65ebe48276..39b7602c552 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-6.0", - "commit": "b53bacaa4e0c5fece1e63608cc7bb2430f671ff0" + "commit": "fa3e9c76e29619bc596218ac43a26575b2f3fd4e" } 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) /* |