declare some PyCXX functions for export, add PyCXX wrapper for Vector…

…2dPy class
FreeCAD · Nov 24, 2016 · 95768ac · 95768ac
1 parent cdf4524
commit 95768ac
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/src/Base/GeometryPyCXX.cpp b/src/Base/GeometryPyCXX.cpp
@@ -108,7 +108,7 @@ Vector2dPy::~Vector2dPy()
 
 void Vector2dPy::init_type(void)
 {
-    behaviors().name( "Vector2dPy" );
+    behaviors().name( "Vector2d" );
     behaviors().doc( "Vector2d class" );
     behaviors().supportGetattro();
     behaviors().supportSetattro();

diff --git a/src/Base/GeometryPyCXX.h b/src/Base/GeometryPyCXX.h
@@ -76,6 +76,8 @@ class BaseExport Vector2dPy : public Py::PythonClass<Vector2dPy>
 
 namespace Py {
 
+typedef PythonClassObject<Base::Vector2dPy> Vector2d;
+
 // Implementing the vector class in the fashion of the PyCXX library.
 class BaseExport Vector : public Object
 {

diff --git a/src/CXX/Python2/ExtensionType.hxx b/src/CXX/Python2/ExtensionType.hxx
@@ -104,7 +104,7 @@
 
 namespace Py
 {
-    extern PythonExtensionBase *getPythonExtensionBase( PyObject *self );
+    PYCXX_EXPORT extern PythonExtensionBase *getPythonExtensionBase( PyObject *self );
 
     struct PythonClassInstance
     {

diff --git a/src/CXX/Python2/cxx_extensions.cxx b/src/CXX/Python2/cxx_extensions.cxx
@@ -650,7 +650,7 @@ PythonType &PythonType::supportIter()
 //    Handlers
 //
 //--------------------------------------------------------------------------------
-PythonExtensionBase *getPythonExtensionBase( PyObject *self )
+PYCXX_EXPORT PythonExtensionBase *getPythonExtensionBase( PyObject *self )
 {
     if( self->ob_type->tp_flags&Py_TPFLAGS_BASETYPE )
     {