From 6f985574b775882075f48f59835bc5a42b1374dd Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Fri, 8 May 2020 18:16:39 +0200 Subject: Cleanup: take includes out of 'extern "C"' blocks Surrounding includes with an 'extern "C"' block is not necessary anymore. Also that made it harder to add any C++ code to some headers, or include headers that have "optional" C++ code like `MEM_guardedalloc.h`. I tested compilation on linux and windows (and got help from @LazyDodo). If this still breaks compilation due to some linker error, the header containing the symbol in question is probably missing an 'extern "C"' block. Differential Revision: https://developer.blender.org/D7653 --- source/blender/compositor/intern/COM_Converter.cpp | 2 -- source/blender/compositor/intern/COM_ExecutionSystem.cpp | 3 +-- source/blender/compositor/intern/COM_MemoryBuffer.h | 2 -- source/blender/compositor/intern/COM_Node.cpp | 2 -- source/blender/compositor/intern/COM_NodeConverter.cpp | 2 -- source/blender/compositor/intern/COM_NodeGraph.cpp | 2 -- source/blender/compositor/intern/COM_NodeGraph.h | 2 -- source/blender/compositor/intern/COM_NodeOperation.h | 2 -- source/blender/compositor/intern/COM_NodeOperationBuilder.cpp | 2 -- source/blender/compositor/intern/COM_WorkScheduler.h | 4 ++-- source/blender/compositor/intern/COM_compositor.cpp | 4 +--- 11 files changed, 4 insertions(+), 23 deletions(-) (limited to 'source/blender/compositor/intern') diff --git a/source/blender/compositor/intern/COM_Converter.cpp b/source/blender/compositor/intern/COM_Converter.cpp index e8474ba8318..edfeb3a3a04 100644 --- a/source/blender/compositor/intern/COM_Converter.cpp +++ b/source/blender/compositor/intern/COM_Converter.cpp @@ -18,11 +18,9 @@ #include -extern "C" { #include "DNA_node_types.h" #include "BKE_node.h" -} #include "COM_NodeOperation.h" #include "COM_NodeOperationBuilder.h" diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.cpp b/source/blender/compositor/intern/COM_ExecutionSystem.cpp index fa40f150335..34682aae2fd 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.cpp +++ b/source/blender/compositor/intern/COM_ExecutionSystem.cpp @@ -20,9 +20,8 @@ #include "BLI_utildefines.h" #include "PIL_time.h" -extern "C" { + #include "BKE_node.h" -} #include "BLT_translation.h" diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index 7e5b0264aa3..6ba8f144482 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -25,10 +25,8 @@ class MemoryBuffer; #include "COM_MemoryProxy.h" #include "COM_SocketReader.h" -extern "C" { #include "BLI_math.h" #include "BLI_rect.h" -} /** * \brief state of a memory buffer diff --git a/source/blender/compositor/intern/COM_Node.cpp b/source/blender/compositor/intern/COM_Node.cpp index df5a8e690d3..31535c5851f 100644 --- a/source/blender/compositor/intern/COM_Node.cpp +++ b/source/blender/compositor/intern/COM_Node.cpp @@ -18,11 +18,9 @@ #include -extern "C" { #include "BKE_node.h" #include "RNA_access.h" -} #include "COM_ExecutionSystem.h" #include "COM_NodeOperation.h" diff --git a/source/blender/compositor/intern/COM_NodeConverter.cpp b/source/blender/compositor/intern/COM_NodeConverter.cpp index eff825b075d..2db31bd4133 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.cpp +++ b/source/blender/compositor/intern/COM_NodeConverter.cpp @@ -16,9 +16,7 @@ * Copyright 2013, Blender Foundation. */ -extern "C" { #include "BLI_utildefines.h" -} #include "COM_Debug.h" diff --git a/source/blender/compositor/intern/COM_NodeGraph.cpp b/source/blender/compositor/intern/COM_NodeGraph.cpp index 6640f144518..cb27fa21b4d 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.cpp +++ b/source/blender/compositor/intern/COM_NodeGraph.cpp @@ -18,14 +18,12 @@ #include -extern "C" { #include "BLI_listbase.h" #include "BLI_utildefines.h" #include "DNA_node_types.h" #include "BKE_node.h" -} #include "COM_CompositorContext.h" #include "COM_Converter.h" diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index b005149c839..531832c2c65 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -23,9 +23,7 @@ #include #include -extern "C" { #include "DNA_node_types.h" -} #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index b2c4961ca35..07f482f9e5f 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -23,11 +23,9 @@ #include #include -extern "C" { #include "BLI_math_color.h" #include "BLI_math_vector.h" #include "BLI_threads.h" -} #include "COM_MemoryBuffer.h" #include "COM_MemoryProxy.h" diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp index 9f6b91915e0..5ce6ca34b34 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.cpp @@ -16,9 +16,7 @@ * Copyright 2013, Blender Foundation. */ -extern "C" { #include "BLI_utildefines.h" -} #include "COM_Converter.h" #include "COM_Debug.h" diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index 5e0675f1833..3a1b4c533bd 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h +++ b/source/blender/compositor/intern/COM_WorkScheduler.h @@ -20,9 +20,9 @@ #define __COM_WORKSCHEDULER_H__ #include "COM_ExecutionGroup.h" -extern "C" { + #include "BLI_threads.h" -} + #include "COM_Device.h" #include "COM_WorkPackage.h" #include "COM_defines.h" diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index 1793abae134..bccdd026ead 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -16,13 +16,11 @@ * Copyright 2011, Blender Foundation. */ -extern "C" { -#include "BKE_node.h" #include "BLI_threads.h" -} #include "BLT_translation.h" +#include "BKE_node.h" #include "BKE_scene.h" #include "COM_ExecutionSystem.h" -- cgit v1.2.3