Merge branch 'blender-v2.90-release'

tests/gtests/alembic/abc_export_test.cc

@@ -4,13 +4,11 @@
 #include "exporter/abc_archive.h"
 #include "intern/abc_util.h"
 
-extern "C" {
 #include "BKE_main.h"
 #include "BLI_fileops.h"
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 #include "DNA_scene_types.h"
-}
 
 #include "DEG_depsgraph.h"
 

tests/gtests/alembic/abc_matrix_test.cc

@@ -3,10 +3,8 @@
 // Keep first since utildefines defines AT which conflicts with STL
 #include "intern/abc_axis_conversion.h"
 
-extern "C" {
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
-}
 
 namespace blender {
 namespace io {

tests/gtests/blenlib/BLI_array_store_test.cc

@@ -4,7 +4,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_array_store.h"
 #include "BLI_array_utils.h"
 #include "BLI_listbase.h"
@@ -13,7 +12,6 @@ extern "C" {
 #include "BLI_string.h"
 #include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
-}
 
 /* print memory savings */
 // #define DEBUG_PRINT

tests/gtests/blenlib/BLI_array_utils_test.cc

@@ -2,11 +2,9 @@
 
 #include "testing/testing.h"
 
-extern "C" {
 #include "BLI_array_utils.h"
 #include "BLI_utildefines.h"
 #include "BLI_utildefines_stack.h"
-}
 
 /* -------------------------------------------------------------------- */
 /* tests */

tests/gtests/blenlib/BLI_delaunay_2d_test.cc

@@ -4,13 +4,11 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_math.h"
 #include "BLI_rand.h"
 #include "PIL_time.h"
 
 #include "BLI_delaunay_2d.h"
-}
 
 #include <fstream>
 #include <iostream>

tests/gtests/blenlib/BLI_expr_pylike_eval_test.cc

@@ -4,10 +4,8 @@
 
 #include <string.h>
 
-extern "C" {
 #include "BLI_expr_pylike_eval.h"
 #include "BLI_math.h"
-};
 
 #define TRUE_VAL 1.0
 #define FALSE_VAL 0.0

tests/gtests/blenlib/BLI_ghash_performance_test.cc

@@ -7,13 +7,11 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_ghash.h"
 #include "BLI_rand.h"
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 #include "PIL_time_utildefines.h"
-}
 
 /* Using http://corpora.uni-leipzig.de/downloads/eng_wikipedia_2010_1M-text.tar.gz
  * (1 million of words, about 122MB of text) from

tests/gtests/blenlib/BLI_ghash_test.cc

@@ -4,11 +4,9 @@
 
 #define GHASH_INTERNAL_API
 
-extern "C" {
 #include "BLI_ghash.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
-}
 
 #define TESTCASE_SIZE 10000
 

tests/gtests/blenlib/BLI_hash_mm2a_test.cc

@@ -2,9 +2,7 @@
 
 #include "testing/testing.h"
 
-extern "C" {
 #include "BLI_hash_mm2a.h"
-}
 
 /* Note: Reference results are taken from reference implementation
  * (cpp code, CMurmurHash2A variant):

tests/gtests/blenlib/BLI_heap_simple_test.cc

@@ -5,13 +5,11 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_compiler_attrs.h"
 #include "BLI_heap_simple.h"
 #include "BLI_rand.h"
 #include "BLI_sys_types.h"
 #include "BLI_utildefines.h"
-};
 
 #define SIZE 1024
 

tests/gtests/blenlib/BLI_heap_test.cc

@@ -5,12 +5,10 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_compiler_attrs.h"
 #include "BLI_heap.h"
 #include "BLI_rand.h"
 #include "BLI_utildefines.h"
-};
 
 #define SIZE 1024
 

tests/gtests/blenlib/BLI_kdopbvh_test.cc

@@ -6,12 +6,10 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_compiler_attrs.h"
 #include "BLI_kdopbvh.h"
 #include "BLI_math_vector.h"
 #include "BLI_rand.h"
-}
 
 #include "stubs/bf_intern_eigen_stubs.h"
 

tests/gtests/blenlib/BLI_listbase_test.cc

@@ -4,13 +4,11 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_array_utils.h"
 #include "BLI_listbase.h"
 #include "BLI_path_util.h"
 #include "BLI_ressource_strings.h"
 #include "BLI_string.h"
-}
 
 /* local validation function */
 static bool listbase_is_valid(const ListBase *listbase)

tests/gtests/blenlib/BLI_memiter_test.cc

@@ -4,13 +4,11 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_array_utils.h"
 #include "BLI_memiter.h"
 
 #include "BLI_ressource_strings.h"
 #include "BLI_string.h"
-}
 
 TEST(memiter, Nop)
 {

tests/gtests/blenlib/BLI_path_util_test.cc

@@ -2,7 +2,6 @@
 
 #include "testing/testing.h"
 
-extern "C" {
 #include "../../../source/blender/imbuf/IMB_imbuf.h"
 #include "BLI_fileops.h"
 #include "BLI_path_util.h"
@@ -11,7 +10,6 @@ extern "C" {
 #ifdef _WIN32
 #  include "../../../source/blender/blenkernel/BKE_global.h"
 #endif
-}
 
 /* -------------------------------------------------------------------- */
 /* stubs */

tests/gtests/blenlib/BLI_polyfill_2d_test.cc

@@ -11,7 +11,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_array_utils.h"
 #include "BLI_edgehash.h"
 #include "BLI_math.h"
@@ -27,7 +26,6 @@ extern "C" {
 #  include "BLI_memarena.h"
 #  include "BLI_polyfill_2d_beautify.h"
 #endif
-}
 
 #include "stubs/bf_intern_eigen_stubs.h"
 

tests/gtests/blenlib/BLI_stack_test.cc

@@ -3,11 +3,9 @@
 #include "testing/testing.h"
 #include <string.h>
 
-extern "C" {
 #include "BLI_array.h"
 #include "BLI_stack.h"
 #include "BLI_utildefines.h"
-};
 
 #define SIZE 1024
 

tests/gtests/blenlib/BLI_string_test.cc

@@ -9,12 +9,10 @@
 #include <utility>
 #include <vector>
 
-extern "C" {
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_string_utils.h"
 #include "BLI_utildefines.h"
-}
 
 using std::initializer_list;
 using std::pair;

tests/gtests/blenlib/BLI_string_utf8_test.cc

@@ -2,11 +2,9 @@
 
 #include "testing/testing.h"
 
-extern "C" {
 #include "BLI_string.h"
 #include "BLI_string_utf8.h"
 #include "BLI_utildefines.h"
-}
 
 /* Note that 'common' utf-8 variants of string functions (like copy, etc.) are tested in
  * BLI_string_test.cc However, tests below are specific utf-8 conformance ones, and since they eat

tests/gtests/blenlib/BLI_task_performance_test.cc

@@ -9,7 +9,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_utildefines.h"
 
 #include "BLI_listbase.h"
@@ -17,7 +16,6 @@ extern "C" {
 #include "BLI_task.h"
 
 #include "PIL_time.h"
-}
 
 #define NUM_RUN_AVERAGED 100
 

tests/gtests/blenlib/BLI_task_test.cc

@@ -7,13 +7,11 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BLI_utildefines.h"
 
 #include "BLI_listbase.h"
 #include "BLI_mempool.h"
 #include "BLI_task.h"
-};
 
 #define NUM_ITEMS 10000
 

tests/gtests/blenloader/blendfile_loading_base_test.cc

@@ -19,7 +19,6 @@
 
 #include "MEM_guardedalloc.h"
 
-extern "C" {
 #include "BKE_appdir.h"
 #include "BKE_blender.h"
 #include "BKE_context.h"
@@ -48,7 +47,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "wm.h"
-}
 
 BlendfileLoadingBaseTest::~BlendfileLoadingBaseTest()
 {

tests/gtests/guardedalloc/guardedalloc_alignment_test.cc

@@ -2,9 +2,7 @@
 
 #include "testing/testing.h"
 
-extern "C" {
 #include "BLI_utildefines.h"
-}
 
 #include "MEM_guardedalloc.h"