Skip to content
Snippets Groups Projects
Commit 096c4b5a authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Use boost::shared_ptr<> instead of std's for backward compatibility

parent fd3911ee
No related branches found
No related tags found
No related merge requests found
...@@ -442,7 +442,7 @@ static PyObject* PyBobIoHDF5File_Describe(PyBobIoHDF5FileObject* self, PyObject ...@@ -442,7 +442,7 @@ static PyObject* PyBobIoHDF5File_Describe(PyBobIoHDF5FileObject* self, PyObject
if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &key)) return 0; if (!PyArg_ParseTupleAndKeywords(args, kwds, "s", kwlist, &key)) return 0;
PyObject* retval = 0; PyObject* retval = 0;
std::shared_ptr<PyObject> retval_; boost::shared_ptr<PyObject> retval_;
try { try {
const std::vector<bob::io::HDF5Descriptor>& dv = self->f->describe(key); const std::vector<bob::io::HDF5Descriptor>& dv = self->f->describe(key);
...@@ -583,7 +583,7 @@ static PyObject* PyBobIoHDF5File_Paths(PyBobIoHDF5FileObject* self, PyObject *ar ...@@ -583,7 +583,7 @@ static PyObject* PyBobIoHDF5File_Paths(PyBobIoHDF5FileObject* self, PyObject *ar
if (pyrel && PyObject_IsTrue(pyrel)) relative = true; if (pyrel && PyObject_IsTrue(pyrel)) relative = true;
PyObject* retval = 0; PyObject* retval = 0;
std::shared_ptr<PyObject> retval_; boost::shared_ptr<PyObject> retval_;
try { try {
std::vector<std::string> values; std::vector<std::string> values;
...@@ -887,17 +887,17 @@ static void null_char_array_deleter(char*) {} ...@@ -887,17 +887,17 @@ static void null_char_array_deleter(char*) {}
static void char_array_deleter(char* o) { delete[] o; } static void char_array_deleter(char* o) { delete[] o; }
#endif #endif
static std::shared_ptr<char> PyBobIo_GetString(PyObject* o) { static boost::shared_ptr<char> PyBobIo_GetString(PyObject* o) {
#if PY_VERSION_HEX < 0x03000000 #if PY_VERSION_HEX < 0x03000000
return std::shared_ptr<char>(PyString_AsString(o), null_char_array_deleter); return boost::shared_ptr<char>(PyString_AsString(o), null_char_array_deleter);
#else #else
if (PyBytes_Check(o)) { if (PyBytes_Check(o)) {
//fast way out //fast way out
return std::shared_ptr<char>(PyBytes_AsString(o), null_char_array_deleter); return boost::shared_ptr<char>(PyBytes_AsString(o), null_char_array_deleter);
} }
PyObject* bytes = 0; PyObject* bytes = 0;
...@@ -916,7 +916,7 @@ static std::shared_ptr<char> PyBobIo_GetString(PyObject* o) { ...@@ -916,7 +916,7 @@ static std::shared_ptr<char> PyBobIo_GetString(PyObject* o) {
char* copy = new char[length]; char* copy = new char[length];
std::strncpy(copy, PyBytes_AsString(bytes), length); std::strncpy(copy, PyBytes_AsString(bytes), length);
return std::shared_ptr<char>(copy, char_array_deleter); return boost::shared_ptr<char>(copy, char_array_deleter);
#endif #endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment