diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 09:18:42 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-19 09:18:42 +0300 |
| commit | 9a301978bdf0a7bab8dedf62e8c623aa33e96177 (patch) | |
| tree | 12582e40131e113efc6a21040c084144e04d002d /source/blender/blenlib | |
| parent | 1f5d51e44ecf99f34d8e733559a9312e5ae3ef33 (diff) | |
| parent | fcac9e841040812f227ecc3f10d4a970b9e174fd (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/intern/BLI_linklist_lockfree.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/BLI_linklist_lockfree.c b/source/blender/blenlib/intern/BLI_linklist_lockfree.c index c004ddb6b66..ef93ce3619f 100644 --- a/source/blender/blenlib/intern/BLI_linklist_lockfree.c +++ b/source/blender/blenlib/intern/BLI_linklist_lockfree.c @@ -77,12 +77,12 @@ void BLI_linklist_lockfree_insert(LockfreeLinkList *list, do { tail_node = list->tail; keep_working = - (atomic_cas_ptr((void**)&tail_node->next, NULL, node) != NULL); + (atomic_cas_ptr((void **)&tail_node->next, NULL, node) != NULL); if (keep_working) { - atomic_cas_ptr((void**)&list->tail, tail_node, tail_node->next); + atomic_cas_ptr((void **)&list->tail, tail_node, tail_node->next); } } while (keep_working); - atomic_cas_ptr((void**)&list->tail, tail_node, node); + atomic_cas_ptr((void **)&list->tail, tail_node, node); } LockfreeLinkNode *BLI_linklist_lockfree_begin(LockfreeLinkList *list) |