comparison PyExtensionModule.cpp @ 66:5664fe298af2

Update to Python 2.7 and clean up the build (avoid using deprecated NumPy API, fix compiler warnings)
author Chris Cannam
date Mon, 17 Nov 2014 09:37:59 +0000
parents af9c4cee95a8
children 146d14ab15e7
comparison
equal deleted inserted replaced
65:0df94e3f0fdb 66:5664fe298af2
147 147
148 /* Module Documentation */ 148 /* Module Documentation */
149 // PyDoc_STRVAR(vampy_doc,"This module exposes Vamp plugin data type wrappers."); 149 // PyDoc_STRVAR(vampy_doc,"This module exposes Vamp plugin data type wrappers.");
150 150
151 static int 151 static int
152 setint(PyObject *d, char *name, int value) 152 setint(PyObject *d, const char *name, int value)
153 { 153 {
154 PyObject *v; 154 PyObject *v;
155 int err; 155 int err;
156 v = PyInt_FromLong((long)value); 156 v = PyInt_FromLong((long)value);
157 err = PyDict_SetItemString(d, name, v); 157 err = PyDict_SetItemString(d, name, v);
158 Py_XDECREF(v); 158 Py_XDECREF(v);
159 return err; 159 return err;
160 } 160 }
161 161
162 static int 162 static int
163 setdbl(PyObject *d, char *name, double value) 163 setdbl(PyObject *d, const char *name, double value)
164 { 164 {
165 PyObject *v; 165 PyObject *v;
166 int err; 166 int err;
167 v = PyFloat_FromDouble(value); 167 v = PyFloat_FromDouble(value);
168 err = PyDict_SetItemString(d, name, v); 168 err = PyDict_SetItemString(d, name, v);
169 Py_XDECREF(v); 169 Py_XDECREF(v);
170 return err; 170 return err;
171 } 171 }
172 172
173 static int 173 static int
174 setstr(PyObject *d, char *name, char *value) 174 setstr(PyObject *d, const char *name, const char *value)
175 { 175 {
176 PyObject *v; 176 PyObject *v;
177 int err; 177 int err;
178 v = PyString_FromString(value); 178 v = PyString_FromString(value);
179 err = PyDict_SetItemString(d, name, v); 179 err = PyDict_SetItemString(d, name, v);