diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2017-12-14 11:34:35 -0500 |
|---|---|---|
| committer | Luke Chen <luke.chen@mongodb.com> | 2017-12-14 11:34:35 -0500 |
| commit | ec894eecfba4009e2ccd685e15351e4dae5848ad (patch) | |
| tree | b347f774ed408c0ff275d6889cc022ab8afe727b /src/third_party/wiredtiger/src/include/misc.h | |
| parent | fe40a36217a2b4e4064165340d44cc1442d84e13 (diff) | |
| download | mongo-ec894eecfba4009e2ccd685e15351e4dae5848ad.tar.gz | |
Import wiredtiger: 1a29eac4dc8cf82de437292da546e3f4039268a4 from branch mongodb-3.8
ref: 596a3c7c01..1a29eac4dc
for: 3.7.1
WT-3079 Make sure eviction visits all trees
WT-3133 Detect or track long latency operations
WT-3295 Allow LSM to merge into custom data sources
WT-3587 Remove HAVE_VERBOSE conditional compilation
WT-3654 Fix warning in Windows build on evergreen
WT-3716 Restore the WT_VERB_TEMPORARY verbose flag.
WT-3720 flags macros cast flags to unsigned values, hiding warnings.
WT-3732 Handle adding WT indices while cursors on the table are open
WT-3734 Fix undefined behavior in verbose output
WT-3738 Review internal session allocation accounting
WT-3753 Building on Windows --enable-java
WT-3772 Hot backup causes uncontrolled growth of WiredTigerPreplog files
WT-3774 Enhance Python lookaside testing to cover cursor modify
WT-3776 Cursor remove operation unpins page too early
WT-3780 Improve error messages on invalid WT_CURSOR::modify usage
WT-3783 Fix transaction isolation to use the correct enum
WT-3786 Transactions with timestamps should read their writes
WT-3787 test_compact02 failed as compaction halted due to eviction pressure
WT-3790 Switch statistics to rdtsc from epoch calls
WT-3793 WiredTiger page debug dump functions should unpack integer keys
WT-3794 Coverity 1383547 and lint
WT-3795 lint cleanups for the op-tracking software, reduce record write size.
Diffstat (limited to 'src/third_party/wiredtiger/src/include/misc.h')
| -rw-r--r-- | src/third_party/wiredtiger/src/include/misc.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/third_party/wiredtiger/src/include/misc.h b/src/third_party/wiredtiger/src/include/misc.h index 2435d37ee20..356ef73dec7 100644 --- a/src/third_party/wiredtiger/src/include/misc.h +++ b/src/third_party/wiredtiger/src/include/misc.h @@ -132,11 +132,10 @@ * hex constant might be a negative integer), and to ensure the hex constant is * the correct size before applying the bitwise not operator. */ -#define FLD_CLR(field, mask) ((void)((field) &= ~(uint32_t)(mask))) -#define FLD_MASK(field, mask) ((field) & (uint32_t)(mask)) +#define FLD_CLR(field, mask) ((void)((field) &= ~(mask))) +#define FLD_MASK(field, mask) ((field) & (mask)) #define FLD_ISSET(field, mask) (FLD_MASK(field, mask) != 0) -#define FLD64_ISSET(field, mask) (((field) & (uint64_t)(mask)) != 0) -#define FLD_SET(field, mask) ((void)((field) |= (uint32_t)(mask))) +#define FLD_SET(field, mask) ((void)((field) |= (mask))) #define F_CLR(p, mask) FLD_CLR((p)->flags, mask) #define F_ISSET(p, mask) FLD_ISSET((p)->flags, mask) @@ -195,12 +194,8 @@ } while (0) /* Verbose messages. */ -#ifdef HAVE_VERBOSE #define WT_VERBOSE_ISSET(session, f) \ (FLD_ISSET(S2C(session)->verbose, f)) -#else -#define WT_VERBOSE_ISSET(session, f) 0 -#endif #define WT_CLEAR(s) \ memset(&(s), 0, sizeof(s)) |