tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

got rid of the STD_SHARED_XX std/tr1 defines

Browse Source
This commit is contained in:
Jean-Francois Dockes
2016-07-13 15:12:25 +02:00
parent 0e0b660ebc
commit 0b0385e459
65 changed files with 219 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/python/recoll/pyrecoll.cpp
+7 -7
View File
@@ -56,7 +56,7 @@ static RclConfig *rclconfig;
typedef struct {
PyObject_HEAD
/* Type-specific fields go here. */
STD_SHARED_PTR<Rcl::SearchData> sd;
std::shared_ptr<Rcl::SearchData> sd;
} recoll_SearchDataObject;
static void
@@ -108,7 +108,7 @@ SearchData_init(recoll_SearchDataObject *self, PyObject *args, PyObject *kwargs)
} else {
stemlang = "english";
}
self->sd = STD_SHARED_PTR<Rcl::SearchData>(new Rcl::SearchData(tp, stemlang));
self->sd = std::shared_ptr<Rcl::SearchData>(new Rcl::SearchData(tp, stemlang));
return 0;
}
@@ -953,7 +953,7 @@ Query_execute(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
return 0;
}
STD_SHARED_PTR<Rcl::SearchData> rq(sd);
std::shared_ptr<Rcl::SearchData> rq(sd);
self->query->setSortBy(*self->sortfield, self->ascending);
self->query->setQuery(rq);
int cnt = self->query->getResCnt();
@@ -1221,7 +1221,7 @@ Query_highlight(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
return 0;
}
STD_SHARED_PTR<Rcl::SearchData> sd = self->query->getSD();
std::shared_ptr<Rcl::SearchData> sd = self->query->getSD();
if (!sd) {
PyErr_SetString(PyExc_ValueError, "Query not initialized");
return 0;
@@ -1272,7 +1272,7 @@ Query_makedocabstract(recoll_QueryObject* self, PyObject *args,PyObject *kwargs)
PyErr_SetString(PyExc_AttributeError, "query");
return 0;
}
STD_SHARED_PTR<Rcl::SearchData> sd = self->query->getSD();
std::shared_ptr<Rcl::SearchData> sd = self->query->getSD();
if (!sd) {
PyErr_SetString(PyExc_ValueError, "Query not initialized");
return 0;
@@ -1328,7 +1328,7 @@ Query_getxquery(recoll_QueryObject* self, PyObject *, PyObject *)
PyErr_SetString(PyExc_AttributeError, "query");
return 0;
}
STD_SHARED_PTR<Rcl::SearchData> sd = self->query->getSD();
std::shared_ptr<Rcl::SearchData> sd = self->query->getSD();
if (!sd) {
PyErr_SetString(PyExc_ValueError, "Query not initialized");
return 0;
@@ -1356,7 +1356,7 @@ Query_getgroups(recoll_QueryObject* self, PyObject *, PyObject *)
PyErr_SetString(PyExc_AttributeError, "query");
return 0;
}
STD_SHARED_PTR<Rcl::SearchData> sd = self->query->getSD();
std::shared_ptr<Rcl::SearchData> sd = self->query->getSD();
if (!sd) {
PyErr_SetString(PyExc_ValueError, "Query not initialized");
return 0;