From bb3ec3ebafbc2c0e5d8530148a433242e0adad30 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 19 Sep 2018 12:05:58 +1000 Subject: BLI_utildefines: rename pointer conversion macros Terms get/set don't make much sense when casting values. Name macros so the conversion is obvious, use common prefix for easier completion. - GET_INT_FROM_POINTER -> POINTER_AS_INT - SET_INT_IN_POINTER -> POINTER_FROM_INT - GET_UINT_FROM_POINTER -> POINTER_AS_UINT - SET_UINT_IN_POINTER -> POINTER_FROM_UINT --- tests/gtests/blenlib/BLI_linklist_lockfree_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/gtests/blenlib/BLI_linklist_lockfree_test.cc') diff --git a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc index b5b790079d5..309efaee00e 100644 --- a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc +++ b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc @@ -74,7 +74,7 @@ void concurrent_insert(TaskPool *__restrict pool, CHECK_NOTNULL(list); IndexedNode *node = (IndexedNode *)MEM_mallocN(sizeof(IndexedNode), "test node"); - node->index = GET_INT_FROM_POINTER(taskdata); + node->index = POINTER_AS_INT(taskdata); BLI_linklist_lockfree_insert(list, (LockfreeLinkNode *)node); } @@ -95,7 +95,7 @@ TEST(LockfreeLinkList, InsertMultipleConcurrent) for (int i = 0; i < num_nodes; ++i) { BLI_task_pool_push(pool, concurrent_insert, - SET_INT_IN_POINTER(i), + POINTER_FROM_INT(i), false, TASK_PRIORITY_HIGH); } -- cgit v1.2.3