From 21a2b975b8192c2714625c8f5e98a08fde796ba7 Mon Sep 17 00:00:00 2001 From: Omar Emara Date: Mon, 8 Feb 2021 17:28:15 +0200 Subject: Cleanup: Remove using-directive from freestyle headers The header files in freestyle utilize the using-directive at the global file scope. This is a bad practice as it pollutes the global name space causing possible ambiguous reference compilation errors. In particular, the DNA files that are included by freestyle will cause those ambiguous reference errors when the developers adds a DNA member with a type name that also exist in the Freestyle name space, such as Curve and possibly others. This patch does the minimal work needed to resolve that by moving the using-directives from the headers into the corresponding translation units. Reviewed By: Brecht Differential Revision: https://developer.blender.org/D10351 --- source/blender/freestyle/intern/python/BPy_FrsNoise.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'source/blender/freestyle/intern/python/BPy_FrsNoise.h') diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.h b/source/blender/freestyle/intern/python/BPy_FrsNoise.h index 09bcc82ae94..0f8f2d3242c 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.h +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.h @@ -27,8 +27,6 @@ extern "C" { #include "../geometry/Noise.h" #include "../system/PseudoNoise.h" -using namespace Freestyle; - #ifdef __cplusplus extern "C" { #endif @@ -41,8 +39,8 @@ extern PyTypeObject FrsNoise_Type; /*---------------------------Python BPy_FrsNoise structure definition----------*/ typedef struct { - PyObject_HEAD Noise *n; - PseudoNoise *pn; + PyObject_HEAD Freestyle::Noise *n; + Freestyle::PseudoNoise *pn; } BPy_FrsNoise; /*---------------------------Python BPy_FrsNoise visible prototypes-----------*/ -- cgit v1.2.3