diff options
| author | Michael Cahill <michael.cahill@mongodb.com> | 2015-08-19 12:04:55 +1000 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2015-08-19 11:45:31 -0400 |
| commit | ba32b71f75c85dd6ff3558346d19154d037888ec (patch) | |
| tree | 3c3b90617c0a337f65d026bd13bc66ced3d0492d /dist | |
| parent | 1c2542ff9337af935ce95a63c91cd2024694634e (diff) | |
| download | mongo-ba32b71f75c85dd6ff3558346d19154d037888ec.tar.gz | |
Merge pull request #2112 from wiredtiger/wt-2025-inline-atomic-functions
WT-2025: inline atomic functions.
(cherry picked from commit ada57c1ed44ab0dd4f904f60a63bbc77333b2baa)
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/s_define.list | 22 | ||||
| -rw-r--r-- | dist/s_string.ok | 2 |
2 files changed, 4 insertions, 20 deletions
diff --git a/dist/s_define.list b/dist/s_define.list index 1bceb6a54fb..65fc60e9c7a 100644 --- a/dist/s_define.list +++ b/dist/s_define.list @@ -17,20 +17,8 @@ TXN_API_CALL TXN_API_CALL_NOCONF TXN_API_END WIN32_LEAN_AND_MEAN -WT_ATOMIC_ADD1 -WT_ATOMIC_ADD2 -WT_ATOMIC_CAS1 -WT_ATOMIC_CAS2 -WT_ATOMIC_CAS_VAL1 -WT_ATOMIC_CAS_VAL2 -WT_ATOMIC_CAS_VAL4 -WT_ATOMIC_FETCH_ADD1 -WT_ATOMIC_FETCH_ADD2 -WT_ATOMIC_FETCH_ADD4 -WT_ATOMIC_STORE1 -WT_ATOMIC_STORE2 -WT_ATOMIC_SUB1 -WT_ATOMIC_SUB2 +WT_ATOMIC_CAS +WT_ATOMIC_FUNC WT_BARRIER WT_BLOCK_DESC_SIZE WT_CACHE_LINE_ALIGNMENT @@ -67,9 +55,3 @@ WT_WITH_LOCK __F __WIREDTIGER_EXT_H_ __WIREDTIGER_H_ -__WT_ATOMIC_ADD -__WT_ATOMIC_CAS -__WT_ATOMIC_CAS_VAL -__WT_ATOMIC_FETCH_ADD -__WT_ATOMIC_STORE -__WT_ATOMIC_SUB diff --git a/dist/s_string.ok b/dist/s_string.ok index 2bdd1d88a54..4dd42826b55 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -464,6 +464,7 @@ bzalloc bzfree bzip calloc +cas catfmt cb cd @@ -909,6 +910,7 @@ ps pse psp pthread +ptr pushms putK putV |