From 1107af1abb0d4bf271e995a18f5d4bd790d51d02 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sun, 26 Jan 2020 16:38:18 +0100 Subject: Fix OBJECT_GUARDED_FREE compiler error when type is in namespace --- tests/gtests/blenlib/BLI_array_store_test.cc | 4 ++-- tests/gtests/blenlib/BLI_delaunay_2d_test.cc | 3 ++- tests/gtests/blenlib/BLI_ghash_performance_test.cc | 3 ++- tests/gtests/blenlib/BLI_heap_simple_test.cc | 4 ++-- tests/gtests/blenlib/BLI_heap_test.cc | 4 ++-- tests/gtests/blenlib/BLI_kdopbvh_test.cc | 3 ++- tests/gtests/blenlib/BLI_listbase_test.cc | 4 ++-- tests/gtests/blenlib/BLI_memiter_test.cc | 3 ++- tests/gtests/blenlib/BLI_polyfill_2d_test.cc | 3 ++- tests/gtests/blenlib/BLI_task_performance_test.cc | 4 ++-- tests/gtests/blenlib/BLI_task_test.cc | 4 ++-- tests/gtests/blenloader/blendfile_loading_base_test.cc | 4 ++-- 12 files changed, 24 insertions(+), 19 deletions(-) (limited to 'tests') diff --git a/tests/gtests/blenlib/BLI_array_store_test.cc b/tests/gtests/blenlib/BLI_array_store_test.cc index 632107c69df..3bca66b613e 100644 --- a/tests/gtests/blenlib/BLI_array_store_test.cc +++ b/tests/gtests/blenlib/BLI_array_store_test.cc @@ -2,10 +2,10 @@ #include "testing/testing.h" +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_array_store.h" - -#include "MEM_guardedalloc.h" #include "BLI_sys_types.h" #include "BLI_utildefines.h" #include "BLI_listbase.h" diff --git a/tests/gtests/blenlib/BLI_delaunay_2d_test.cc b/tests/gtests/blenlib/BLI_delaunay_2d_test.cc index 85e8ae3f141..946dc03eca3 100644 --- a/tests/gtests/blenlib/BLI_delaunay_2d_test.cc +++ b/tests/gtests/blenlib/BLI_delaunay_2d_test.cc @@ -2,8 +2,9 @@ #include "testing/testing.h" -extern "C" { #include "MEM_guardedalloc.h" + +extern "C" { #include "BLI_math.h" #include "BLI_rand.h" #include "PIL_time.h" diff --git a/tests/gtests/blenlib/BLI_ghash_performance_test.cc b/tests/gtests/blenlib/BLI_ghash_performance_test.cc index ba995e5014f..58dd9998733 100644 --- a/tests/gtests/blenlib/BLI_ghash_performance_test.cc +++ b/tests/gtests/blenlib/BLI_ghash_performance_test.cc @@ -5,8 +5,9 @@ #define GHASH_INTERNAL_API -extern "C" { #include "MEM_guardedalloc.h" + +extern "C" { #include "BLI_utildefines.h" #include "BLI_ghash.h" #include "BLI_rand.h" diff --git a/tests/gtests/blenlib/BLI_heap_simple_test.cc b/tests/gtests/blenlib/BLI_heap_simple_test.cc index 16e1ecbf9cf..bad5c40eb66 100644 --- a/tests/gtests/blenlib/BLI_heap_simple_test.cc +++ b/tests/gtests/blenlib/BLI_heap_simple_test.cc @@ -3,14 +3,14 @@ #include "testing/testing.h" #include +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_sys_types.h" #include "BLI_compiler_attrs.h" #include "BLI_heap_simple.h" #include "BLI_utildefines.h" #include "BLI_rand.h" - -#include "MEM_guardedalloc.h" }; #define SIZE 1024 diff --git a/tests/gtests/blenlib/BLI_heap_test.cc b/tests/gtests/blenlib/BLI_heap_test.cc index 884093435e4..ddec706eb0e 100644 --- a/tests/gtests/blenlib/BLI_heap_test.cc +++ b/tests/gtests/blenlib/BLI_heap_test.cc @@ -3,13 +3,13 @@ #include "testing/testing.h" #include +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_compiler_attrs.h" #include "BLI_heap.h" #include "BLI_utildefines.h" #include "BLI_rand.h" - -#include "MEM_guardedalloc.h" }; #define SIZE 1024 diff --git a/tests/gtests/blenlib/BLI_kdopbvh_test.cc b/tests/gtests/blenlib/BLI_kdopbvh_test.cc index 7e32c545e75..e0762f22840 100644 --- a/tests/gtests/blenlib/BLI_kdopbvh_test.cc +++ b/tests/gtests/blenlib/BLI_kdopbvh_test.cc @@ -4,12 +4,13 @@ /* TODO: ray intersection, overlap ... etc.*/ +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_compiler_attrs.h" #include "BLI_kdopbvh.h" #include "BLI_rand.h" #include "BLI_math_vector.h" -#include "MEM_guardedalloc.h" } #include "stubs/bf_intern_eigen_stubs.h" diff --git a/tests/gtests/blenlib/BLI_listbase_test.cc b/tests/gtests/blenlib/BLI_listbase_test.cc index e5919c5dfb1..5ecf0533763 100644 --- a/tests/gtests/blenlib/BLI_listbase_test.cc +++ b/tests/gtests/blenlib/BLI_listbase_test.cc @@ -2,11 +2,11 @@ #include "testing/testing.h" +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_array_utils.h" #include "BLI_listbase.h" -#include "MEM_guardedalloc.h" - #include "BLI_string.h" #include "BLI_path_util.h" #include "BLI_ressource_strings.h" diff --git a/tests/gtests/blenlib/BLI_memiter_test.cc b/tests/gtests/blenlib/BLI_memiter_test.cc index d92daefff3b..07ef0745845 100644 --- a/tests/gtests/blenlib/BLI_memiter_test.cc +++ b/tests/gtests/blenlib/BLI_memiter_test.cc @@ -2,10 +2,11 @@ #include "testing/testing.h" +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_array_utils.h" #include "BLI_memiter.h" -#include "MEM_guardedalloc.h" #include "BLI_string.h" #include "BLI_ressource_strings.h" diff --git a/tests/gtests/blenlib/BLI_polyfill_2d_test.cc b/tests/gtests/blenlib/BLI_polyfill_2d_test.cc index 5566dced798..264ed8fadbc 100644 --- a/tests/gtests/blenlib/BLI_polyfill_2d_test.cc +++ b/tests/gtests/blenlib/BLI_polyfill_2d_test.cc @@ -9,13 +9,14 @@ #define USE_COMBINATIONS_ALL #define USE_BEAUTIFY +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_utildefines.h" #include "BLI_array_utils.h" #include "BLI_polyfill_2d.h" #include "BLI_edgehash.h" #include "BLI_math.h" -#include "MEM_guardedalloc.h" #ifdef USE_OBJ_PREVIEW # include "BLI_string.h" diff --git a/tests/gtests/blenlib/BLI_task_performance_test.cc b/tests/gtests/blenlib/BLI_task_performance_test.cc index 84b7b8b6439..c5af75f1eb2 100644 --- a/tests/gtests/blenlib/BLI_task_performance_test.cc +++ b/tests/gtests/blenlib/BLI_task_performance_test.cc @@ -7,6 +7,8 @@ #define GHASH_INTERNAL_API +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_utildefines.h" @@ -15,8 +17,6 @@ extern "C" { #include "BLI_task.h" #include "PIL_time.h" - -#include "MEM_guardedalloc.h" } #define NUM_RUN_AVERAGED 100 diff --git a/tests/gtests/blenlib/BLI_task_test.cc b/tests/gtests/blenlib/BLI_task_test.cc index a682e8aedf6..d4ab9de13c4 100644 --- a/tests/gtests/blenlib/BLI_task_test.cc +++ b/tests/gtests/blenlib/BLI_task_test.cc @@ -5,14 +5,14 @@ #include "atomic_ops.h" +#include "MEM_guardedalloc.h" + extern "C" { #include "BLI_utildefines.h" #include "BLI_listbase.h" #include "BLI_mempool.h" #include "BLI_task.h" - -#include "MEM_guardedalloc.h" }; #define NUM_ITEMS 10000 diff --git a/tests/gtests/blenloader/blendfile_loading_base_test.cc b/tests/gtests/blenloader/blendfile_loading_base_test.cc index 7af3293d706..c4e873c255f 100644 --- a/tests/gtests/blenloader/blendfile_loading_base_test.cc +++ b/tests/gtests/blenloader/blendfile_loading_base_test.cc @@ -17,6 +17,8 @@ */ #include "blendfile_loading_base_test.h" +#include "MEM_guardedalloc.h" + extern "C" { #include "BKE_appdir.h" #include "BKE_blender.h" @@ -41,8 +43,6 @@ extern "C" { #include "IMB_imbuf.h" -#include "MEM_guardedalloc.h" - #include "RNA_define.h" #include "WM_api.h" -- cgit v1.2.3