Mercurial > hg > vampy
diff PyTypeInterface.h @ 33:c4da8d559872 vampy2
* build fixes for Linux
author | cannam |
---|---|
date | Wed, 23 Sep 2009 11:56:46 +0000 |
parents | a8231788216c |
children | c905122f79e7 |
line wrap: on
line diff
--- a/PyTypeInterface.h Mon Sep 21 13:56:28 2009 +0000 +++ b/PyTypeInterface.h Wed Sep 23 11:56:46 2009 +0000 @@ -76,7 +76,7 @@ }; /* C++ mapping of PyNone Type*/ -typedef struct NoneType {}; +struct NoneType {}; class PyTypeInterface { @@ -147,7 +147,7 @@ template<typename RET> - RET PyTypeInterface::PyValue_To_VampDescriptor(PyObject* pyValue) const + RET PyValue_To_VampDescriptor(PyObject* pyValue) const //returns e.g. Vamp::Plugin::OutputDescriptor or Vamp::Plugin::Feature { PyObject* pyDict; @@ -183,7 +183,8 @@ /// Convert a sequence (tipically list) of PySomething to /// OutputList,ParameterList or FeatureList template<typename RET,typename ELEM> //<OutputList> <OutputDescriptor> - RET PyTypeInterface::PyValue_To_VampList(PyObject* pyList) const + + RET PyValue_To_VampList(PyObject* pyList) const { // Vamp::Plugin::OutputList list; // Vamp::Plugin::OutputDescriptor od; @@ -214,7 +215,7 @@ /// Convert DTYPE type 1D NumpyArray to std::vector<RET> template<typename RET, typename DTYPE> - std::vector<RET> PyTypeInterface::PyArray_Convert(char* raw_data_ptr, long length) const + std::vector<RET> PyArray_Convert(char* raw_data_ptr, long length) const { std::vector<RET> rValue; DTYPE* data = (DTYPE*) raw_data_ptr; @@ -388,4 +389,4 @@ NPY_USERDEF=256 /* leave room for characters */ }; #endif /*NUMPY_REFERENCE*/ -#endif \ No newline at end of file +#endif