Merge pull request #216 from fredroy/fix_pybind_2_8_1

Fix for pybind version >= 2.8.1

Author: hugtalbot

Plugin/src/SofaPython3/PythonFactory.cpp

@@ -57,8 +57,8 @@ using sofa::core::objectmodel::Event;
 
 #include <sofa/defaulttype/DataTypeInfo.h>
 
-/// Bind the python's attribute error
-namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
+SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
 

Plugin/src/SofaPython3/config.h

@@ -37,4 +37,12 @@
 	#define SOFAPYTHON3_API PYBIND11_EXPORT
 #else
 	#define SOFAPYTHON3_API SOFA_IMPORT_DYNAMIC_LIBRARY
-#endif
+#endif
+
+// pybind11 already bind the attributeError starting from 2.8.1 version.
+// so if the version is >= 2.8.1, macro does nothing, otherwise bind attribute_error
+#if not(PYBIND11_VERSION_MAJOR >= 2 && PYBIND11_VERSION_MINOR >= 8 && PYBIND11_VERSION_PATCH >= 1)
+#define SOFAPYTHON3_BIND_ATTRIBUTE_ERROR() namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
+#else
+#define SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+#endif // not(PYBIND11_VERSION >= 2.8.1)

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Base.cpp

@@ -43,8 +43,7 @@ using sofa::simulation::Node;
 
 #include <SofaPython3/DataHelper.h>
 
-/// Bind the python's attribute error
-namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
+SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
 
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_BaseData.cpp

@@ -33,8 +33,8 @@
 #include <SofaPython3/DataHelper.h>
 #include <SofaPython3/PythonFactory.h>
 
-/// Bind the python's attribute error
-namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
+SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
 

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp

@@ -28,8 +28,8 @@
 #include <SofaPython3/PythonFactory.h>
 #include <SofaPython3/PythonEnvironment.h>
 
-/// Bind the python's attribute error
-namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
+SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
 

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_DataEngine.cpp

@@ -27,8 +27,8 @@ using sofapython3::PythonEnvironment;
 
 #include <pybind11/pybind11.h>
 
-/// Bind the python's attribute error
-namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
+SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
 

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Prefab.cpp

@@ -36,8 +36,8 @@ using sofa::simulation::VisualInitVisitor;
 using sofa::simulation::Simulation;
 
 
-/// Bind the python's attribute error
-namespace pybind11 { PYBIND11_RUNTIME_EXCEPTION(attribute_error, PyExc_AttributeError) }
+SOFAPYTHON3_BIND_ATTRIBUTE_ERROR()
+
 /// Makes an alias for the pybind11 namespace to increase readability.
 namespace py { using namespace pybind11; }
 /// To bring in the `_a` literal