Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2020-05-20 03:14:49 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-05-20 01:32:17 +0300
commit4f622c9a080b9f519ee9f7829b154e1401bb96ff (patch)
tree65a2021492b7bd1cb7e3eb8344ec3c4795278ed9 /tests/gtests
parente610964e890f6b5b2ead0e3a1ca0df5996ec5c95 (diff)
Fix Windows build after recent guardedalloc changes
Diffstat (limited to 'tests/gtests')
-rw-r--r--tests/gtests/blenlib/BLI_linklist_lockfree_test.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
index 023d02e5075..d1a527d57ac 100644
--- a/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
+++ b/tests/gtests/blenlib/BLI_linklist_lockfree_test.cc
@@ -87,9 +87,7 @@ TEST(LockfreeLinkList, InsertMultipleConcurrent)
BLI_task_pool_push(pool, concurrent_insert, POINTER_FROM_INT(i), false, NULL);
}
/* Run all the tasks. */
- BLI_threaded_malloc_begin();
BLI_task_pool_work_and_wait(pool);
- BLI_threaded_malloc_end();
/* Verify we've got all the data properly inserted. */
EXPECT_EQ(list.head, &list.dummy_node);
bool *visited_nodes = (bool *)MEM_callocN(sizeof(bool) * num_nodes, "visited nodes");