diff options
author | Omar Emara <mail@OmarEmara.dev> | 2021-02-08 18:28:15 +0300 |
---|---|---|
committer | Omar Emara <mail@OmarEmara.dev> | 2021-02-08 18:29:42 +0300 |
commit | 21a2b975b8192c2714625c8f5e98a08fde796ba7 (patch) | |
tree | 6ed0259b5f525072aa48e22e0f3764d6aee17e52 /source/blender/freestyle/intern/python/BPy_Id.h | |
parent | 048135e2c826b46ecf77324b93246ad70171e91d (diff) |
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
Diffstat (limited to 'source/blender/freestyle/intern/python/BPy_Id.h')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_Id.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Id.h b/source/blender/freestyle/intern/python/BPy_Id.h index f5952297c66..51a70a391b1 100644 --- a/source/blender/freestyle/intern/python/BPy_Id.h +++ b/source/blender/freestyle/intern/python/BPy_Id.h @@ -26,12 +26,8 @@ extern "C" { #include <iostream> -using namespace std; - #include "../system/Id.h" -using namespace Freestyle; - #ifdef __cplusplus extern "C" { #endif @@ -44,7 +40,7 @@ extern PyTypeObject Id_Type; /*---------------------------Python BPy_Id structure definition----------*/ typedef struct { - PyObject_HEAD Id *id; + PyObject_HEAD Freestyle::Id *id; } BPy_Id; /*---------------------------Python BPy_Id visible prototypes-----------*/ |