Commit: f86c965d7f22b1a9b633ac3039e32327030822f3 Author: Campbell Barton Date: Wed Aug 8 11:49:51 2018 +1000 Branches: master https://developer.blender.org/rBf86c965d7f22b1a9b633ac3039e32327030822f3
Cleanup: use conforming header guard =================================================================== M source/blender/compositor/intern/COM_CPUDevice.h M source/blender/compositor/intern/COM_ChunkOrder.h M source/blender/compositor/intern/COM_ChunkOrderHotspot.h M source/blender/compositor/intern/COM_CompositorContext.h M source/blender/compositor/intern/COM_Converter.h M source/blender/compositor/intern/COM_Debug.h M source/blender/compositor/intern/COM_Device.h M source/blender/compositor/intern/COM_ExecutionGroup.h M source/blender/compositor/intern/COM_ExecutionSystem.h M source/blender/compositor/intern/COM_MemoryBuffer.h M source/blender/compositor/intern/COM_MemoryProxy.h M source/blender/compositor/intern/COM_NodeConverter.h M source/blender/compositor/intern/COM_NodeGraph.h M source/blender/compositor/intern/COM_NodeOperation.h M source/blender/compositor/intern/COM_NodeOperationBuilder.h M source/blender/compositor/intern/COM_OpenCLDevice.h M source/blender/compositor/intern/COM_SingleThreadedOperation.h M source/blender/compositor/intern/COM_SocketReader.h M source/blender/compositor/intern/COM_WorkPackage.h M source/blender/compositor/intern/COM_WorkScheduler.h M source/blender/compositor/nodes/COM_AlphaOverNode.h M source/blender/compositor/nodes/COM_BilateralBlurNode.h M source/blender/compositor/nodes/COM_BlurNode.h M source/blender/compositor/nodes/COM_BokehBlurNode.h M source/blender/compositor/nodes/COM_BokehImageNode.h M source/blender/compositor/nodes/COM_BoxMaskNode.h M source/blender/compositor/nodes/COM_BrightnessNode.h M source/blender/compositor/nodes/COM_ChannelMatteNode.h M source/blender/compositor/nodes/COM_ChromaMatteNode.h M source/blender/compositor/nodes/COM_ColorBalanceNode.h M source/blender/compositor/nodes/COM_ColorCorrectionNode.h M source/blender/compositor/nodes/COM_ColorCurveNode.h M source/blender/compositor/nodes/COM_ColorMatteNode.h M source/blender/compositor/nodes/COM_ColorNode.h M source/blender/compositor/nodes/COM_ColorRampNode.h M source/blender/compositor/nodes/COM_ColorSpillNode.h M source/blender/compositor/nodes/COM_ColorToBWNode.h M source/blender/compositor/nodes/COM_CombineColorNode.h M source/blender/compositor/nodes/COM_CompositorNode.h M source/blender/compositor/nodes/COM_ConvertAlphaNode.h M source/blender/compositor/nodes/COM_CornerPinNode.h M source/blender/compositor/nodes/COM_CropNode.h M source/blender/compositor/nodes/COM_CryptomatteNode.h M source/blender/compositor/nodes/COM_DefocusNode.h M source/blender/compositor/nodes/COM_DespeckleNode.h M source/blender/compositor/nodes/COM_DifferenceMatteNode.h M source/blender/compositor/nodes/COM_DilateErodeNode.h M source/blender/compositor/nodes/COM_DirectionalBlurNode.h M source/blender/compositor/nodes/COM_DisplaceNode.h M source/blender/compositor/nodes/COM_DistanceMatteNode.h M source/blender/compositor/nodes/COM_DoubleEdgeMaskNode.h M source/blender/compositor/nodes/COM_EllipseMaskNode.h M source/blender/compositor/nodes/COM_FlipNode.h M source/blender/compositor/nodes/COM_GammaNode.h M source/blender/compositor/nodes/COM_GlareNode.h M source/blender/compositor/nodes/COM_HueSaturationValueCorrectNode.h M source/blender/compositor/nodes/COM_HueSaturationValueNode.h M source/blender/compositor/nodes/COM_IDMaskNode.h M source/blender/compositor/nodes/COM_InpaintNode.h M source/blender/compositor/nodes/COM_InvertNode.h M source/blender/compositor/nodes/COM_LensDistortionNode.h M source/blender/compositor/nodes/COM_MapUVNode.h M source/blender/compositor/nodes/COM_MathNode.h M source/blender/compositor/nodes/COM_MixNode.h M source/blender/compositor/nodes/COM_MovieDistortionNode.h M source/blender/compositor/nodes/COM_NormalNode.h M source/blender/compositor/nodes/COM_NormalizeNode.h M source/blender/compositor/nodes/COM_OutputFileNode.h M source/blender/compositor/nodes/COM_PixelateNode.h M source/blender/compositor/nodes/COM_RotateNode.h M source/blender/compositor/nodes/COM_ScaleNode.h M source/blender/compositor/nodes/COM_SeparateColorNode.h M source/blender/compositor/nodes/COM_SetAlphaNode.h M source/blender/compositor/nodes/COM_SocketProxyNode.h M source/blender/compositor/nodes/COM_SplitViewerNode.h M source/blender/compositor/nodes/COM_Stabilize2dNode.h M source/blender/compositor/nodes/COM_SunBeamsNode.h M source/blender/compositor/nodes/COM_SwitchNode.h M source/blender/compositor/nodes/COM_SwitchViewNode.h M source/blender/compositor/nodes/COM_TimeNode.h M source/blender/compositor/nodes/COM_TonemapNode.h M source/blender/compositor/nodes/COM_TranslateNode.h M source/blender/compositor/nodes/COM_ValueNode.h M source/blender/compositor/nodes/COM_VectorBlurNode.h M source/blender/compositor/nodes/COM_VectorCurveNode.h M source/blender/compositor/nodes/COM_ViewLevelsNode.h M source/blender/compositor/nodes/COM_ViewerNode.h M source/blender/compositor/nodes/COM_ZCombineNode.h M source/blender/compositor/operations/COM_AlphaOverKeyOperation.h M source/blender/compositor/operations/COM_AlphaOverMixedOperation.h M source/blender/compositor/operations/COM_AlphaOverPremultiplyOperation.h M source/blender/compositor/operations/COM_AntiAliasOperation.h M source/blender/compositor/operations/COM_BlurBaseOperation.h M source/blender/compositor/operations/COM_BokehImageOperation.h M source/blender/compositor/operations/COM_BoxMaskOperation.h M source/blender/compositor/operations/COM_BrightnessOperation.h M source/blender/compositor/operations/COM_CalculateMeanOperation.h M source/blender/compositor/operations/COM_CalculateStandardDeviationOperation.h M source/blender/compositor/operations/COM_ChangeHSVOperation.h M source/blender/compositor/operations/COM_ChannelMatteOperation.h M source/blender/compositor/operations/COM_ChromaMatteOperation.h M source/blender/compositor/operations/COM_ColorBalanceASCCDLOperation.h M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.h M source/blender/compositor/operations/COM_ColorCorrectionOperation.h M source/blender/compositor/operations/COM_ColorCurveOperation.h M source/blender/compositor/operations/COM_ColorMatteOperation.h M source/blender/compositor/operations/COM_ColorRampOperation.h M source/blender/compositor/operations/COM_ColorSpillOperation.h M source/blender/compositor/operations/COM_CompositorOperation.h M source/blender/compositor/operations/COM_ConvertColorProfileOperation.h M source/blender/compositor/operations/COM_ConvertDepthToRadiusOperation.h M source/blender/compositor/operations/COM_ConvertOperation.h M source/blender/compositor/operations/COM_ConvolutionEdgeFilterOperation.h M source/blender/compositor/operations/COM_ConvolutionFilterOperation.h M source/blender/compositor/operations/COM_CropOperation.h M source/blender/compositor/operations/COM_CryptomatteOperation.h M source/blender/compositor/operations/COM_CurveBaseOperation.h M source/blender/compositor/operations/COM_DespeckleOperation.h M source/blender/compositor/operations/COM_DifferenceMatteOperation.h M source/blender/compositor/operations/COM_DilateErodeOperation.h M source/blender/compositor/operations/COM_DisplaceOperation.h M source/blender/compositor/operations/COM_DisplaceSimpleOperation.h M source/blender/compositor/operations/COM_DistanceRGBMatteOperation.h M source/blender/compositor/operations/COM_DistanceYCCMatteOperation.h M source/blender/compositor/operations/COM_DotproductOperation.h M source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.h M source/blender/compositor/operations/COM_EllipseMaskOperation.h M source/blender/compositor/operations/COM_FastGaussianBlurOperation.h M source/blender/compositor/operations/COM_FlipOperation.h M source/blender/compositor/operations/COM_GammaCorrectOperation.h M source/blender/compositor/operations/COM_GammaOperation.h M source/blender/compositor/operations/COM_GaussianAlphaXBlurOperation.h M source/blender/compositor/operations/COM_GaussianAlphaYBlurOperation.h M source/blender/compositor/operations/COM_GaussianXBlurOperation.h M source/blender/compositor/operations/COM_GaussianYBlurOperation.h M source/blender/compositor/operations/COM_GlareBaseOperation.h M source/blender/compositor/operations/COM_GlareFogGlowOperation.h M source/blender/compositor/operations/COM_GlareGhostOperation.h M source/blender/compositor/operations/COM_GlareSimpleStarOperation.h M source/blender/compositor/operations/COM_GlareStreaksOperation.h M source/blender/compositor/operations/COM_GlareThresholdOperation.h M source/blender/compositor/operations/COM_HueSaturationValueCorrectOperation.h M source/blender/compositor/operations/COM_IDMaskOperation.h M source/blender/compositor/operations/COM_ImageOperation.h M source/blender/compositor/operations/COM_InpaintOperation.h M source/blender/compositor/operations/COM_InvertOperation.h M source/blender/compositor/operations/COM_KeyingBlurOperation.h M source/blender/compositor/operations/COM_KeyingClipOperation.h M source/blender/compositor/operations/COM_KeyingDespillOperation.h M source/blender/compositor/operations/COM_KeyingOperation.h M source/blender/compositor/operations/COM_KeyingScreenOperation.h M source/blender/compositor/operations/COM_LuminanceMatteOperation.h M source/blender/compositor/operations/COM_MapRangeOperation.h M source/blender/compositor/operations/COM_MapUVOperation.h M source/blender/compositor/operations/COM_MapValueOperation.h M source/blender/compositor/operations/COM_MaskOperation.h M source/blender/compositor/operations/COM_MathBaseOperation.h M source/blender/compositor/operations/COM_MixOperation.h M source/blender/compositor/operations/COM_MovieClipAttributeOperation.h M source/blender/compositor/operations/COM_MovieClipOperation.h M source/blender/compositor/operations/COM_MovieDistortionOperation.h M source/blender/compositor/operations/COM_MultilayerImageOperation.h M source/blender/compositor/operations/COM_NormalizeOperation.h M source/blender/compositor/operations/COM_OutputFileMultiViewOperation.h M source/blender/compositor/operations/COM_OutputFileOperation.h M source/blender/compositor/operations/COM_PixelateOperation.h M source/blender/compositor/operations/COM_PlaneCornerPinOperation.h M source/blender/compositor/operations/COM_PlaneDistortCommonOperation.h M source/blender/compositor/operations/COM_PlaneTrackOperation.h M source/blender/compositor/operations/COM_PreviewOperation.h M source/blender/compositor/operations/COM_ProjectorLensDistortionOperation.h M source/blender/compositor/operations/COM_QualityStepHelper.h M source/blender/compositor/operations/COM_ReadBufferOperation.h M source/blender/compositor/operations/COM_RenderLayersProg.h M source/blender/compositor/operations/COM_RotateOperation.h M source/blender/compositor/operations/COM_ScaleOperation.h M source/blender/compositor/operations/COM_ScreenLensDistortionOperation.h M source/blender/compositor/operations/COM_SetAlphaOperation.h M source/blender/compositor/operations/COM_SetColorOperation.h M source/blender/compositor/operations/COM_SetSamplerOperation.h M source/blender/compositor/operations/COM_SetValueOperation.h M source/blender/compositor/operations/COM_SetVectorOperation.h M source/blender/compositor/operations/COM_SocketProxyOperation.h M source/blender/compositor/operations/COM_SplitOperation.h M source/blender/compositor/operations/COM_SunBeamsOperation.h M source/blender/compositor/operations/COM_TextureOperation.h M source/blender/compositor/operations/COM_TonemapOperation.h M source/blender/compositor/operations/COM_TrackPositionOperation.h M source/blender/compositor/operations/COM_TranslateOperation.h M source/blender/compositor/operations/COM_VectorBlurOperation.h M source/blender/compositor/operations/COM_VectorCurveOperation.h M source/blender/compositor/operations/COM_ViewerOperation.h M source/blender/compositor/operations/COM_WrapOperation.h M source/blender/compositor/operations/COM_WriteBufferOperation.h M source/blender/compositor/operations/COM_ZCombineOperation.h =================================================================== diff --git a/source/blender/compositor/intern/COM_CPUDevice.h b/source/blender/compositor/intern/COM_CPUDevice.h index f98a75e5978..b938b5fc588 100644 --- a/source/blender/compositor/intern/COM_CPUDevice.h +++ b/source/blender/compositor/intern/COM_CPUDevice.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_CPUDevice_h -#define _COM_CPUDevice_h +#ifndef __COM_CPUDEVICE_H__ +#define __COM_CPUDEVICE_H__ #include "COM_Device.h" diff --git a/source/blender/compositor/intern/COM_ChunkOrder.h b/source/blender/compositor/intern/COM_ChunkOrder.h index 4728b771e3c..f61816c6511 100644 --- a/source/blender/compositor/intern/COM_ChunkOrder.h +++ b/source/blender/compositor/intern/COM_ChunkOrder.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_ChunkOrder_h_ -#define _COM_ChunkOrder_h_ +#ifndef __COM_CHUNKORDER_H__ +#define __COM_CHUNKORDER_H__ #include "COM_ChunkOrderHotspot.h" class ChunkOrder { diff --git a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h index 09e9fa44c3b..620980518ef 100644 --- a/source/blender/compositor/intern/COM_ChunkOrderHotspot.h +++ b/source/blender/compositor/intern/COM_ChunkOrderHotspot.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_ChunkOrderHotSpot_h_ -#define _COM_ChunkOrderHotSpot_h_ +#ifndef __COM_CHUNKORDERHOTSPOT_H__ +#define __COM_CHUNKORDERHOTSPOT_H__ #ifdef WITH_CXX_GUARDEDALLOC #include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/intern/COM_CompositorContext.h b/source/blender/compositor/intern/COM_CompositorContext.h index 1c702503915..b43e163870c 100644 --- a/source/blender/compositor/intern/COM_CompositorContext.h +++ b/source/blender/compositor/intern/COM_CompositorContext.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_CompositorContext_h -#define _COM_CompositorContext_h +#ifndef __COM_COMPOSITORCONTEXT_H__ +#define __COM_COMPOSITORCONTEXT_H__ #include <vector> #include <string> diff --git a/source/blender/compositor/intern/COM_Converter.h b/source/blender/compositor/intern/COM_Converter.h index b57220351e8..d0b888e24a0 100644 --- a/source/blender/compositor/intern/COM_Converter.h +++ b/source/blender/compositor/intern/COM_Converter.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_Converter_h -#define _COM_Converter_h +#ifndef __COM_CONVERTER_H__ +#define __COM_CONVERTER_H__ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/compositor/intern/COM_Debug.h b/source/blender/compositor/intern/COM_Debug.h index f5db93e8825..8a5014afb96 100644 --- a/source/blender/compositor/intern/COM_Debug.h +++ b/source/blender/compositor/intern/COM_Debug.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_Debug_h -#define _COM_Debug_h +#ifndef __COM_DEBUG_H__ +#define __COM_DEBUG_H__ #include <map> #include <string> diff --git a/source/blender/compositor/intern/COM_Device.h b/source/blender/compositor/intern/COM_Device.h index 4ab6e1e2f96..202ca1d0b4f 100644 --- a/source/blender/compositor/intern/COM_Device.h +++ b/source/blender/compositor/intern/COM_Device.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_Device_h -#define _COM_Device_h +#ifndef __COM_DEVICE_H__ +#define __COM_DEVICE_H__ #include "COM_WorkPackage.h" diff --git a/source/blender/compositor/intern/COM_ExecutionGroup.h b/source/blender/compositor/intern/COM_ExecutionGroup.h index 20ffbeaa357..88c702b8477 100644 --- a/source/blender/compositor/intern/COM_ExecutionGroup.h +++ b/source/blender/compositor/intern/COM_ExecutionGroup.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_ExecutionGroup_h -#define _COM_ExecutionGroup_h +#ifndef __COM_EXECUTIONGROUP_H__ +#define __COM_EXECUTIONGROUP_H__ #include "COM_Node.h" #include "COM_NodeOperation.h" diff --git a/source/blender/compositor/intern/COM_ExecutionSystem.h b/source/blender/compositor/intern/COM_ExecutionSystem.h index acde4a9b772..0990df31c55 100644 --- a/source/blender/compositor/intern/COM_ExecutionSystem.h +++ b/source/blender/compositor/intern/COM_ExecutionSystem.h @@ -22,8 +22,8 @@ class ExecutionGroup; -#ifndef _COM_ExecutionSystem_h -#define _COM_ExecutionSystem_h +#ifndef __COM_EXECUTIONSYSTEM_H__ +#define __COM_EXECUTIONSYSTEM_H__ #include "DNA_color_types.h" #include "DNA_node_types.h" @@ -185,4 +185,4 @@ private: #endif }; -#endif /* _COM_ExecutionSystem_h */ +#endif /* __COM_EXECUTIONSYSTEM_H__ */ diff --git a/source/blender/compositor/intern/COM_MemoryBuffer.h b/source/blender/compositor/intern/COM_MemoryBuffer.h index be948b3e99b..5f6485475d0 100644 --- a/source/blender/compositor/intern/COM_MemoryBuffer.h +++ b/source/blender/compositor/intern/COM_MemoryBuffer.h @@ -22,8 +22,8 @@ class MemoryBuffer; -#ifndef _COM_MemoryBuffer_h_ -#define _COM_MemoryBuffer_h_ +#ifndef __COM_MEMORYBUFFER_H__ +#define __COM_MEMORYBUFFER_H__ #include "COM_ExecutionGroup.h" #include "COM_MemoryProxy.h" diff --git a/source/blender/compositor/intern/COM_MemoryProxy.h b/source/blender/compositor/intern/COM_MemoryProxy.h index b732db37db2..a628c09fa1f 100644 --- a/source/blender/compositor/intern/COM_MemoryProxy.h +++ b/source/blender/compositor/intern/COM_MemoryProxy.h @@ -23,8 +23,8 @@ class MemoryProxy; -#ifndef _COM_MemoryProxy_h_ -#define _COM_MemoryProxy_h_ +#ifndef __COM_MEMORYPROXY_H__ +#define __COM_MEMORYPROXY_H__ #include "COM_ExecutionGroup.h" class ExecutionGroup; diff --git a/source/blender/compositor/intern/COM_NodeConverter.h b/source/blender/compositor/intern/COM_NodeConverter.h index 825c26bb7af..4fb6b70ad1b 100644 --- a/source/blender/compositor/intern/COM_NodeConverter.h +++ b/source/blender/compositor/intern/COM_NodeConverter.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_NodeCompiler_h -#define _COM_NodeCompiler_h +#ifndef __COM_NODECONVERTER_H__ +#define __COM_NODECONVERTER_H__ #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" @@ -118,4 +118,4 @@ private: #endif }; -#endif /* _COM_NodeCompiler_h */ +#endif /* __COM_NODECONVERTER_H__ */ diff --git a/source/blender/compositor/intern/COM_NodeGraph.h b/source/blender/compositor/intern/COM_NodeGraph.h index 7c6322d2a42..4513a7721d6 100644 --- a/source/blender/compositor/intern/COM_NodeGraph.h +++ b/source/blender/compositor/intern/COM_NodeGraph.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_NodeGraph_h -#define _COM_NodeGraph_h +#ifndef __COM_NODEGRAPH_H__ +#define __COM_NODEGRAPH_H__ #include <map> #include <set> @@ -113,4 +113,4 @@ protected: #endif }; -#endif /* _COM_NodeGraph_h */ +#endif /* __COM_NODEGRAPH_H__ */ diff --git a/source/blender/compositor/intern/COM_NodeOperation.h b/source/blender/compositor/intern/COM_NodeOperation.h index 5ee3cc22b53..9ab9156e7e4 100644 --- a/source/blender/compositor/intern/COM_NodeOperation.h +++ b/source/blender/compositor/intern/COM_NodeOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_Operation_h -#define _COM_Operation_h +#ifndef __COM_NODEOPERATION_H__ +#define __COM_NODEOPERATION_H__ #include <list> #include <string> diff --git a/source/blender/compositor/intern/COM_NodeOperationBuilder.h b/source/blender/compositor/intern/COM_NodeOperationBuilder.h index 0eafd27b46a..71622b1e9bb 100644 --- a/source/blender/compositor/intern/COM_NodeOperationBuilder.h +++ b/source/blender/compositor/intern/COM_NodeOperationBuilder.h @@ -19,8 +19,8 @@ * Lukas Toenne */ -#ifndef _COM_NodeCompilerImpl_h -#define _COM_NodeCompilerImpl_h +#ifndef __COM_NODEOPERATIONBUILDER_H__ +#define __COM_NODEOPERATIONBUILDER_H__ #include <map> #include <set> @@ -167,4 +167,4 @@ private: #endif }; -#endif /* _COM_NodeCompilerImpl_h */ +#endif /* __COM_NODEOPERATIONBUILDER_H__ */ diff --git a/source/blender/compositor/intern/COM_OpenCLDevice.h b/source/blender/compositor/intern/COM_OpenCLDevice.h index fa358f65ddf..a3a5cd36902 100644 --- a/source/blender/compositor/intern/COM_OpenCLDevice.h +++ b/source/blender/compositor/intern/COM_OpenCLDevice.h @@ -22,8 +22,8 @@ class OpenCLDevice; -#ifndef _COM_OpenCLDevice_h -#define _COM_OpenCLDevice_h +#ifndef __COM_OPENCLDEVICE_H__ +#define __COM_OPENCLDEVICE_H__ #include "COM_Device.h" #include "clew.h" diff --git a/source/blender/compositor/intern/COM_SingleThreadedOperation.h b/source/blender/compositor/intern/COM_SingleThreadedOperation.h index e0dc06ef733..b582e47dba7 100644 --- a/source/blender/compositor/intern/COM_SingleThreadedOperation.h +++ b/source/blender/compositor/intern/COM_SingleThreadedOperation.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_SingleThreadedOperation_h -#define _COM_SingleThreadedOperation_h +#ifndef __COM_SINGLETHREADEDOPERATION_H__ +#define __COM_SINGLETHREADEDOPERATION_H__ #include "COM_NodeOperation.h" class SingleThreadedOperation : public NodeOperation { diff --git a/source/blender/compositor/intern/COM_SocketReader.h b/source/blender/compositor/intern/COM_SocketReader.h index ff72d925184..af6b891e7ab 100644 --- a/source/blender/compositor/intern/COM_SocketReader.h +++ b/source/blender/compositor/intern/COM_SocketReader.h @@ -20,8 +20,8 @@ * Monique Dewanchand */ -#ifndef _COM_SocketReader_h -#define _COM_SocketReader_h +#ifndef __COM_SOCKETREADER_H__ +#define __COM_SOCKETREADER_H__ #include "BLI_rect.h" #include "COM_defines.h" @@ -121,4 +121,4 @@ public: #endif }; -#endif /* _COM_SocketReader_h */ +#endif /* __COM_SOCKETREADER_H__ */ diff --git a/source/blender/compositor/intern/COM_WorkPackage.h b/source/blender/compositor/intern/COM_WorkPackage.h index 970a69b38d8..b0a74a1b0ee 100644 --- a/source/blender/compositor/intern/COM_WorkPackage.h +++ b/source/blender/compositor/intern/COM_WorkPackage.h @@ -22,8 +22,8 @@ class WorkPackage; -#ifndef _COM_WorkPackage_h_ -#define _COM_WorkPackage_h_ +#ifndef __COM_WORKPACKAGE_H__ +#define __COM_WORKPACKAGE_H__ class ExecutionGroup; #include "COM_ExecutionGroup.h" diff --git a/source/blender/compositor/intern/COM_WorkScheduler.h b/source/blender/compositor/intern/COM_WorkScheduler.h index 14b02e70913..a08b3856a8b 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.h + @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs