From c1d06dd450d1d6bd6e676aeeca94e26f99dcd485 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 13 Jul 2016 15:12:25 +0200 Subject: [PATCH] got rid of the STD_SHARED_XX std/tr1 defines --- src/common/conf_post.h | 7 -- src/common/rclconfig.h | 6 +- src/common/syngroups.cpp | 6 +- src/common/textsplit.cpp | 8 +-- src/index/subtreelist.cpp | 4 +- .../kioslave/kio_recoll-kde4/kio_recoll.cpp | 8 +-- src/kde/kioslave/kio_recoll-kde4/kio_recoll.h | 4 +- src/kde/kioslave/kio_recoll/kio_recoll.cpp | 8 +-- src/kde/kioslave/kio_recoll/kio_recoll.h | 4 +- src/php/recoll/recoll.cpp | 2 +- src/python/recoll/pyrecoll.cpp | 14 ++-- src/qtgui/advsearch_w.cpp | 10 +-- src/qtgui/advsearch_w.h | 6 +- src/qtgui/advshist.cpp | 18 ++--- src/qtgui/advshist.h | 12 ++-- src/qtgui/confgui/confgui.h | 4 +- src/qtgui/preview_plaintorich.cpp | 2 +- src/qtgui/preview_plaintorich.h | 6 +- src/qtgui/preview_w.h | 4 +- src/qtgui/rclm_saveload.cpp | 4 +- src/qtgui/rclm_view.cpp | 6 +- src/qtgui/rclm_wins.cpp | 4 +- src/qtgui/rclmain_w.cpp | 71 ++++++------------- src/qtgui/rclmain_w.h | 8 +-- src/qtgui/reslist.cpp | 10 +-- src/qtgui/reslist.h | 6 +- src/qtgui/respopup.cpp | 4 +- src/qtgui/respopup.h | 4 +- src/qtgui/restable.cpp | 14 ++-- src/qtgui/restable.h | 10 +-- src/qtgui/snippets_w.h | 6 +- src/qtgui/spell_w.cpp | 2 +- src/qtgui/ssearch_w.cpp | 4 +- src/qtgui/ssearch_w.h | 4 +- src/qtgui/webcache.cpp | 8 +-- src/qtgui/webcache.h | 2 +- src/qtgui/xmltosd.h | 4 +- src/query/docseq.cpp | 4 +- src/query/docseq.h | 10 +-- src/query/docseqdb.cpp | 8 +-- src/query/docseqdb.h | 12 ++-- src/query/filtseq.cpp | 2 +- src/query/filtseq.h | 4 +- src/query/recollq.cpp | 2 +- src/query/reslistpager.h | 6 +- src/query/sortseq.h | 4 +- src/query/wasaparse.cpp | 2 +- src/rcldb/expansiondbs.cpp | 6 +- src/rcldb/rclabstract.cpp | 2 +- src/rcldb/rcldb.cpp | 2 +- src/rcldb/rcldb.h | 2 +- src/rcldb/rcldups.cpp | 2 +- src/rcldb/rclquery.cpp | 2 +- src/rcldb/rclquery.h | 8 +-- src/rcldb/rclterms.cpp | 12 ++-- src/rcldb/searchdata.cpp | 2 +- src/rcldb/searchdata.h | 10 +-- src/rcldb/synfamily.cpp | 6 +- src/utils/circache.cpp | 12 ++-- src/utils/execmd.cpp | 12 ++-- src/utils/netcon.cpp | 8 +-- src/utils/netcon.h | 8 +-- src/utils/rclutil.h | 4 +- src/utils/smallut.cpp | 12 ++-- src/windows/execmd_w.cpp | 8 +-- 65 files changed, 219 insertions(+), 257 deletions(-) diff --git a/src/common/conf_post.h b/src/common/conf_post.h index eeb33ca0..43fa5c54 100644 --- a/src/common/conf_post.h +++ b/src/common/conf_post.h @@ -1,10 +1,3 @@ -#define UNORDERED_MAP_INCLUDE -#define UNORDERED_SET_INCLUDE -#define STD_UNORDERED_MAP std::unordered_map -#define STD_UNORDERED_SET std::unordered_set -#define MEMORY_INCLUDE -#define STD_SHARED_PTR std::shared_ptr - #ifdef _WIN32 #include "safewindows.h" diff --git a/src/common/rclconfig.h b/src/common/rclconfig.h index b11a916e..986dfebe 100644 --- a/src/common/rclconfig.h +++ b/src/common/rclconfig.h @@ -23,7 +23,7 @@ #include #include #include -#include UNORDERED_SET_INCLUDE +#include using std::string; using std::vector; @@ -378,10 +378,10 @@ class RclConfig { static string o_localecharset; // Limiting set of mime types to be processed. Normally empty. ParamStale m_rmtstate; - STD_UNORDERED_SET m_restrictMTypes; + std::unordered_set m_restrictMTypes; // Exclusion set of mime types. Normally empty ParamStale m_xmtstate; - STD_UNORDERED_SET m_excludeMTypes; + std::unordered_set m_excludeMTypes; vector > m_thrConf; diff --git a/src/common/syngroups.cpp b/src/common/syngroups.cpp index 25faf2e8..efbc42e9 100644 --- a/src/common/syngroups.cpp +++ b/src/common/syngroups.cpp @@ -23,7 +23,7 @@ #include "smallut.h" #include -#include UNORDERED_MAP_INCLUDE +#include #include #include #include @@ -46,7 +46,7 @@ public: } bool ok; // Term to group num - STD_UNORDERED_MAP terms; + std::unordered_map terms; // Group num to group vector > groups; }; @@ -170,7 +170,7 @@ vector SynGroups::getgroup(const string& term) if (!ok()) return ret; - STD_UNORDERED_MAP::const_iterator it1 = + std::unordered_map::const_iterator it1 = m->terms.find(term); if (it1 == m->terms.end()) { LOGDEB1("SynGroups::getgroup: [" << (term) << "] not found in direct map\n" ); diff --git a/src/common/textsplit.cpp b/src/common/textsplit.cpp index e5b6758a..7b797421 100644 --- a/src/common/textsplit.cpp +++ b/src/common/textsplit.cpp @@ -24,7 +24,7 @@ #include #include #include -#include UNORDERED_SET_INCLUDE +#include #include "textsplit.h" #include "log.h" @@ -62,9 +62,9 @@ static int charclasses[charclasses_size]; // management of Unicode properties, but seems to do the job well // enough in most common cases static vector vpuncblocks; -static STD_UNORDERED_SET spunc; -static STD_UNORDERED_SET visiblewhite; -static STD_UNORDERED_SET sskip; +static std::unordered_set spunc; +static std::unordered_set visiblewhite; +static std::unordered_set sskip; class CharClassInit { public: diff --git a/src/index/subtreelist.cpp b/src/index/subtreelist.cpp index e668ce02..c7fe1ecc 100644 --- a/src/index/subtreelist.cpp +++ b/src/index/subtreelist.cpp @@ -18,7 +18,7 @@ #ifndef TEST_SUBTREELIST #include "autoconfig.h" -#include MEMORY_INCLUDE +#include #include "cstr.h" #include "rcldb.h" @@ -38,7 +38,7 @@ bool subtreelist(RclConfig *config, const string& top, } Rcl::SearchData *sd = new Rcl::SearchData(Rcl::SCLT_OR, cstr_null); - STD_SHARED_PTR rq(sd); + std::shared_ptr rq(sd); sd->addClause(new Rcl::SearchDataClausePath(top, false)); diff --git a/src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp b/src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp index c2010ea5..a7db6174 100644 --- a/src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp +++ b/src/kde/kioslave/kio_recoll-kde4/kio_recoll.cpp @@ -332,8 +332,8 @@ bool RecollProtocol::doSearch(const QueryDesc& qd) return false; } - STD_SHARED_PTR sdata(sd); - STD_SHARED_PTRquery(new Rcl::Query(m_rcldb)); + std::shared_ptr sdata(sd); + std::shared_ptrquery(new Rcl::Query(m_rcldb)); query->setCollapseDuplicates(prefs.collapseDuplicates); if (!query->setQuery(sdata)) { m_reason = "Query execute failed. Invalid query or syntax error?"; @@ -342,12 +342,12 @@ bool RecollProtocol::doSearch(const QueryDesc& qd) } DocSequenceDb *src = - new DocSequenceDb(STD_SHARED_PTR(query), "Query results", sdata); + new DocSequenceDb(std::shared_ptr(query), "Query results", sdata); if (src == 0) { error(KIO::ERR_SLAVE_DEFINED, "Can't build result sequence"); return false; } - m_source = STD_SHARED_PTR(src); + m_source = std::shared_ptr(src); // Reset pager in all cases. Costs nothing, stays at page -1 initially // htmldosearch will fetch the first page if needed. m_pager.setDocSource(m_source); diff --git a/src/kde/kioslave/kio_recoll-kde4/kio_recoll.h b/src/kde/kioslave/kio_recoll-kde4/kio_recoll.h index b4fac1a9..c2da5578 100644 --- a/src/kde/kioslave/kio_recoll-kde4/kio_recoll.h +++ b/src/kde/kioslave/kio_recoll-kde4/kio_recoll.h @@ -32,7 +32,7 @@ using std::string; #include "rcldb.h" #include "reslistpager.h" #include "docseq.h" -#include MEMORY_INCLUDE +#include class RecollProtocol; @@ -181,7 +181,7 @@ class RecollProtocol : public KIO::SlaveBase { // (one slave several konqueror windows) would be to have a small // cache of recent searches kept open. RecollKioPager m_pager; - STD_SHARED_PTR m_source; + std::shared_ptr m_source; // Note: page here is not used, current page always comes from m_pager. QueryDesc m_query; }; diff --git a/src/kde/kioslave/kio_recoll/kio_recoll.cpp b/src/kde/kioslave/kio_recoll/kio_recoll.cpp index 53fecb29..ca4df5e9 100644 --- a/src/kde/kioslave/kio_recoll/kio_recoll.cpp +++ b/src/kde/kioslave/kio_recoll/kio_recoll.cpp @@ -336,8 +336,8 @@ bool RecollProtocol::doSearch(const QueryDesc& qd) return false; } - STD_SHARED_PTR sdata(sd); - STD_SHARED_PTRquery(new Rcl::Query(m_rcldb)); + std::shared_ptr sdata(sd); + std::shared_ptrquery(new Rcl::Query(m_rcldb)); query->setCollapseDuplicates(prefs.collapseDuplicates); if (!query->setQuery(sdata)) { m_reason = "Query execute failed. Invalid query or syntax error?"; @@ -346,12 +346,12 @@ bool RecollProtocol::doSearch(const QueryDesc& qd) } DocSequenceDb *src = - new DocSequenceDb(STD_SHARED_PTR(query), "Query results", sdata); + new DocSequenceDb(std::shared_ptr(query), "Query results", sdata); if (src == 0) { error(KIO::ERR_SLAVE_DEFINED, u8s2qs("Can't build result sequence")); return false; } - m_source = STD_SHARED_PTR(src); + m_source = std::shared_ptr(src); // Reset pager in all cases. Costs nothing, stays at page -1 initially // htmldosearch will fetch the first page if needed. m_pager.setDocSource(m_source); diff --git a/src/kde/kioslave/kio_recoll/kio_recoll.h b/src/kde/kioslave/kio_recoll/kio_recoll.h index 5a222be1..6529f91e 100644 --- a/src/kde/kioslave/kio_recoll/kio_recoll.h +++ b/src/kde/kioslave/kio_recoll/kio_recoll.h @@ -28,7 +28,7 @@ #include "rcldb.h" #include "docseq.h" #include "reslistpager.h" -#include MEMORY_INCLUDE +#include class RecollProtocol; @@ -191,7 +191,7 @@ private: // (one slave several konqueror windows) would be to have a small // cache of recent searches kept open. RecollKioPager m_pager; - STD_SHARED_PTR m_source; + std::shared_ptr m_source; // Note: page here is not used, current page always comes from m_pager. QueryDesc m_query; }; diff --git a/src/php/recoll/recoll.cpp b/src/php/recoll/recoll.cpp index 6c454282..9b2addc0 100644 --- a/src/php/recoll/recoll.cpp +++ b/src/php/recoll/recoll.cpp @@ -131,7 +131,7 @@ PHP_METHOD(Query, query) RETURN_BOOL(false); } - STD_SHARED_PTR rq(sd); + std::shared_ptr rq(sd); Rcl::Query *pRclQuery = new Rcl::Query(pRclDb); pRclQuery->setQuery(rq); diff --git a/src/python/recoll/pyrecoll.cpp b/src/python/recoll/pyrecoll.cpp index ffa1cd44..c3e26527 100644 --- a/src/python/recoll/pyrecoll.cpp +++ b/src/python/recoll/pyrecoll.cpp @@ -56,7 +56,7 @@ static RclConfig *rclconfig; typedef struct { PyObject_HEAD /* Type-specific fields go here. */ - STD_SHARED_PTR sd; + std::shared_ptr 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(new Rcl::SearchData(tp, stemlang)); + self->sd = std::shared_ptr(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 rq(sd); + std::shared_ptr 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 sd = self->query->getSD(); + std::shared_ptr 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 sd = self->query->getSD(); + std::shared_ptr 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 sd = self->query->getSD(); + std::shared_ptr 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 sd = self->query->getSD(); + std::shared_ptr sd = self->query->getSD(); if (!sd) { PyErr_SetString(PyExc_ValueError, "Query not initialized"); return 0; diff --git a/src/qtgui/advsearch_w.cpp b/src/qtgui/advsearch_w.cpp index 17d6a86f..0cabbebe 100644 --- a/src/qtgui/advsearch_w.cpp +++ b/src/qtgui/advsearch_w.cpp @@ -360,7 +360,7 @@ using namespace Rcl; void AdvSearch::runSearch() { string stemLang = prefs.stemlang(); - STD_SHARED_PTR sdata(new SearchData(conjunctCMB->currentIndex() == 0 ? + std::shared_ptr sdata(new SearchData(conjunctCMB->currentIndex() == 0 ? SCLT_AND : SCLT_OR, stemLang)); bool hasclause = false; @@ -427,7 +427,7 @@ void AdvSearch::runSearch() if (sdata->getTp() == SCLT_AND) { sdata->addClause(pathclause); } else { - STD_SHARED_PTR + std::shared_ptr nsdata(new SearchData(SCLT_AND, stemLang)); nsdata->addClause(new Rcl::SearchDataClauseSub(sdata)); nsdata->addClause(pathclause); @@ -462,7 +462,7 @@ void AdvSearch::runSearch() // Set up fields from existing search data, which must be compatible // with what we can do... -void AdvSearch::fromSearch(STD_SHARED_PTR sdata) +void AdvSearch::fromSearch(std::shared_ptr sdata) { if (sdata->m_tp == SCLT_OR) conjunctCMB->setCurrentIndex(1); @@ -560,7 +560,7 @@ void AdvSearch::slotHistoryNext() { if (g_advshistory == 0) return; - STD_SHARED_PTR sd = g_advshistory->getnewer(); + std::shared_ptr sd = g_advshistory->getnewer(); if (!sd) return; fromSearch(sd); @@ -570,7 +570,7 @@ void AdvSearch::slotHistoryPrev() { if (g_advshistory == 0) return; - STD_SHARED_PTR sd = g_advshistory->getolder(); + std::shared_ptr sd = g_advshistory->getolder(); if (!sd) return; fromSearch(sd); diff --git a/src/qtgui/advsearch_w.h b/src/qtgui/advsearch_w.h index 8a5ec972..581bf442 100644 --- a/src/qtgui/advsearch_w.h +++ b/src/qtgui/advsearch_w.h @@ -25,7 +25,7 @@ #include "searchclause_w.h" #include "recoll.h" -#include MEMORY_INCLUDE +#include #include "searchdata.h" #include "advshist.h" @@ -56,7 +56,7 @@ public slots: virtual void restrictFtCB_toggled(bool); virtual void restrictCtCB_toggled(bool); virtual void runSearch(); - virtual void fromSearch(STD_SHARED_PTR sdata); + virtual void fromSearch(std::shared_ptr sdata); virtual void browsePB_clicked(); virtual void saveFileTypes(); virtual void delClause(); @@ -66,7 +66,7 @@ public slots: virtual void slotHistoryPrev(); signals: - void startSearch(STD_SHARED_PTR, bool); + void startSearch(std::shared_ptr, bool); private: virtual void init(); diff --git a/src/qtgui/advshist.cpp b/src/qtgui/advshist.cpp index cad7cad3..4666913d 100644 --- a/src/qtgui/advshist.cpp +++ b/src/qtgui/advshist.cpp @@ -33,38 +33,38 @@ AdvSearchHist::AdvSearchHist() AdvSearchHist::~AdvSearchHist() { - for (vector >::iterator it = m_entries.begin(); + for (vector >::iterator it = m_entries.begin(); it != m_entries.end(); it++) { it->reset(); } } -STD_SHARED_PTR AdvSearchHist::getnewest() +std::shared_ptr AdvSearchHist::getnewest() { if (m_entries.empty()) - return STD_SHARED_PTR(); + return std::shared_ptr(); return m_entries[0]; } -STD_SHARED_PTR AdvSearchHist::getolder() +std::shared_ptr AdvSearchHist::getolder() { m_current++; if (m_current >= int(m_entries.size())) { m_current--; - return STD_SHARED_PTR(); + return std::shared_ptr(); } return m_entries[m_current]; } -STD_SHARED_PTR AdvSearchHist::getnewer() +std::shared_ptr AdvSearchHist::getnewer() { if (m_current == -1 || m_current == 0 || m_entries.empty()) - return STD_SHARED_PTR(); + return std::shared_ptr(); return m_entries[--m_current]; } -bool AdvSearchHist::push(STD_SHARED_PTR sd) +bool AdvSearchHist::push(std::shared_ptr sd) { m_entries.insert(m_entries.begin(), sd); if (m_current != -1) @@ -83,7 +83,7 @@ bool AdvSearchHist::read() for (list::const_iterator it = lxml.begin(); it != lxml.end(); it++) { - STD_SHARED_PTR sd = xmlToSearchData(*it); + std::shared_ptr sd = xmlToSearchData(*it); if (sd) m_entries.push_back(sd); } diff --git a/src/qtgui/advshist.h b/src/qtgui/advshist.h index 8c48fbf5..a894b214 100644 --- a/src/qtgui/advshist.h +++ b/src/qtgui/advshist.h @@ -21,7 +21,7 @@ #include #include "recoll.h" -#include MEMORY_INCLUDE +#include #include "searchdata.h" /** Advanced search history. @@ -44,14 +44,14 @@ public: ~AdvSearchHist(); // Add entry - bool push(STD_SHARED_PTR); + bool push(std::shared_ptr); // Get latest. does not change state - STD_SHARED_PTR getnewest(); + std::shared_ptr getnewest(); // Cursor - STD_SHARED_PTR getolder(); - STD_SHARED_PTR getnewer(); + std::shared_ptr getolder(); + std::shared_ptr getnewer(); void clear(); @@ -59,7 +59,7 @@ private: bool read(); int m_current; - std::vector > m_entries; + std::vector > m_entries; }; #endif // _ADVSHIST_H_INCLUDED_ diff --git a/src/qtgui/confgui/confgui.h b/src/qtgui/confgui/confgui.h index 18c081e5..7c0c01e6 100644 --- a/src/qtgui/confgui/confgui.h +++ b/src/qtgui/confgui/confgui.h @@ -46,7 +46,7 @@ #include #include -#include MEMORY_INCLUDE +#include class QHBoxLayout; class QLineEdit; @@ -65,7 +65,7 @@ namespace confgui { virtual bool set(const std::string& val) = 0; virtual bool get(std::string& val) = 0; }; - typedef STD_SHARED_PTR ConfLink; + typedef std::shared_ptr ConfLink; // Useful to store/manage data which has no direct representation in // the config, ie list of subkey directories diff --git a/src/qtgui/preview_plaintorich.cpp b/src/qtgui/preview_plaintorich.cpp index 9204e5c6..2f400515 100644 --- a/src/qtgui/preview_plaintorich.cpp +++ b/src/qtgui/preview_plaintorich.cpp @@ -156,7 +156,7 @@ QString PlainToRichQtPreview::curAnchorName() const ToRichThread::ToRichThread(const string &i, const HighlightData& hd, - STD_SHARED_PTR ptr, + std::shared_ptr ptr, QStringList& qrichlist, QObject *parent) : QThread(parent), m_input(i), m_hdata(hd), m_ptr(ptr), m_output(qrichlist) diff --git a/src/qtgui/preview_plaintorich.h b/src/qtgui/preview_plaintorich.h index cd973237..ab508bba 100644 --- a/src/qtgui/preview_plaintorich.h +++ b/src/qtgui/preview_plaintorich.h @@ -21,7 +21,7 @@ #include #include #include -#include MEMORY_INCLUDE +#include #include #include @@ -58,7 +58,7 @@ class ToRichThread : public QThread { public: ToRichThread(const string &i, const HighlightData& hd, - STD_SHARED_PTR ptr, + std::shared_ptr ptr, QStringList& qrichlst, // Output QObject *parent = 0); virtual void run(); @@ -66,7 +66,7 @@ public: private: const string &m_input; const HighlightData &m_hdata; - STD_SHARED_PTR m_ptr; + std::shared_ptr m_ptr; QStringList &m_output; }; diff --git a/src/qtgui/preview_w.h b/src/qtgui/preview_w.h index de682e38..d46a73e4 100644 --- a/src/qtgui/preview_w.h +++ b/src/qtgui/preview_w.h @@ -26,7 +26,7 @@ #include -#include MEMORY_INCLUDE +#include #include #include @@ -73,7 +73,7 @@ protected: private: Preview *m_preview; - STD_SHARED_PTR m_plaintorich; + std::shared_ptr m_plaintorich; bool m_dspflds; string m_url; // filename for this tab diff --git a/src/qtgui/rclm_saveload.cpp b/src/qtgui/rclm_saveload.cpp index 9f143f5a..90702ec0 100644 --- a/src/qtgui/rclm_saveload.cpp +++ b/src/qtgui/rclm_saveload.cpp @@ -57,7 +57,7 @@ void RclMain::saveLastQuery() xml = sSearch->asXML(); } else { if (g_advshistory) { - STD_SHARED_PTR sd; + std::shared_ptr sd; sd = g_advshistory->getnewest(); if (sd) { xml = sd->asXML(); @@ -116,7 +116,7 @@ void RclMain::loadSavedQuery() } // Try to parse as SearchData - STD_SHARED_PTR sd = xmlToSearchData(xml); + std::shared_ptr sd = xmlToSearchData(xml); if (sd) { showAdvSearchDialog(); asearchform->fromSearch(sd); diff --git a/src/qtgui/rclm_view.cpp b/src/qtgui/rclm_view.cpp index baa607ec..6322d2fd 100644 --- a/src/qtgui/rclm_view.cpp +++ b/src/qtgui/rclm_view.cpp @@ -66,9 +66,9 @@ void RclMain::viewUrl() // StartNativeViewer needs a db source to call getEnclosing() on. Rcl::Query *query = new Rcl::Query(rcldb); DocSequenceDb *src = - new DocSequenceDb(STD_SHARED_PTR(query), "", - STD_SHARED_PTR(new Rcl::SearchData)); - m_source = STD_SHARED_PTR(src); + new DocSequenceDb(std::shared_ptr(query), "", + std::shared_ptr(new Rcl::SearchData)); + m_source = std::shared_ptr(src); // Start a native viewer if the mimetype has one defined, else a diff --git a/src/qtgui/rclm_wins.cpp b/src/qtgui/rclm_wins.cpp index 1c5836a8..54ae49e2 100644 --- a/src/qtgui/rclm_wins.cpp +++ b/src/qtgui/rclm_wins.cpp @@ -49,8 +49,8 @@ void RclMain::showAdvSearchDialog() this, SLOT (fileExit())); connect(asearchform, - SIGNAL(startSearch(STD_SHARED_PTR, bool)), - this, SLOT(startSearch(STD_SHARED_PTR, bool))); + SIGNAL(startSearch(std::shared_ptr, bool)), + this, SLOT(startSearch(std::shared_ptr, bool))); asearchform->show(); } else { // Close and reopen, in hope that makes us visible... diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp index 634a735c..9c785487 100644 --- a/src/qtgui/rclmain_w.cpp +++ b/src/qtgui/rclmain_w.cpp @@ -17,7 +17,7 @@ #include "autoconfig.h" #include -#include MEMORY_INCLUDE +#include #include #include @@ -68,20 +68,6 @@ #include "rclhelp.h" #include "moc_rclmain_w.cpp" -/* Qt5 moc expands macros when defining signals. The SIGNAL() macro is - a stringification, so it does not expand macros. We have signals - where one of the types is a #define (for the variations on - std::shared_ptr). In qt5, the connection does not work because the - signal string is different between the definition and the connect - call, because of the different macro expansion. We have to use - another level of macro in Qt5 to force macro expansion, but not in - Qt4, so we both define the XSIGNAL and XSLOT macros here, and have - ifdefs in the code. What a mess... */ -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) -#define XSIGNAL(X) SIGNAL(X) -#define XSLOT(X) SLOT(X) -#endif - using std::pair; QString g_stringAllStem, g_stringNoStem; @@ -307,15 +293,9 @@ void RclMain::init() connect(&m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(updateIdxStatus())); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) connect(sSearch, - XSIGNAL(startSearch(STD_SHARED_PTR, bool)), - this, XSLOT(startSearch(STD_SHARED_PTR, bool))); -#else - connect(sSearch, - SIGNAL(startSearch(STD_SHARED_PTR, bool)), - this, SLOT(startSearch(STD_SHARED_PTR, bool))); -#endif + SIGNAL(startSearch(std::shared_ptr, bool)), + this, SLOT(startSearch(std::shared_ptr, bool))); connect(sSearch, SIGNAL(clearSearch()), this, SLOT(resetSearch())); connect(preferencesMenu, SIGNAL(triggered(QAction*)), @@ -383,14 +363,8 @@ void RclMain::init() restable->setRclMain(this, true); connect(actionSaveResultsAsCSV, SIGNAL(triggered()), restable, SLOT(saveAsCSV())); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) - connect(this, XSIGNAL(docSourceChanged(STD_SHARED_PTR)), - restable, XSLOT(setDocSource(STD_SHARED_PTR))); -#else - connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR)), - restable, SLOT(setDocSource(STD_SHARED_PTR))); -#endif - + connect(this, SIGNAL(docSourceChanged(std::shared_ptr)), + restable, SLOT(setDocSource(std::shared_ptr))); connect(this, SIGNAL(searchReset()), restable, SLOT(resetSource())); connect(this, SIGNAL(resultsReady()), @@ -419,13 +393,8 @@ void RclMain::init() this, SLOT(showSnippets(Rcl::Doc))); reslist->setRclMain(this, true); -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) - connect(this, XSIGNAL(docSourceChanged(STD_SHARED_PTR)), - reslist, XSLOT(setDocSource(STD_SHARED_PTR))); -#else - connect(this, SIGNAL(docSourceChanged(STD_SHARED_PTR)), - reslist, SLOT(setDocSource(STD_SHARED_PTR))); -#endif + connect(this, SIGNAL(docSourceChanged(std::shared_ptr)), + reslist, SLOT(setDocSource(std::shared_ptr))); connect(firstPageAction, SIGNAL(triggered()), reslist, SLOT(resultPageFirst())); connect(prevPageAction, SIGNAL(triggered()), @@ -694,7 +663,7 @@ void RclMain::fileExit() } // Start a db query and set the reslist docsource -void RclMain::startSearch(STD_SHARED_PTR sdata, bool issimple) +void RclMain::startSearch(std::shared_ptr sdata, bool issimple) { LOGDEB("RclMain::startSearch. Indexing " << (m_idxproc?"on":"off") << " Active " << (m_queryActive) << "\n" ); if (m_queryActive) { @@ -703,7 +672,7 @@ void RclMain::startSearch(STD_SHARED_PTR sdata, bool issimple) } m_queryActive = true; restable->setEnabled(false); - m_source = STD_SHARED_PTR(); + m_source = std::shared_ptr(); m_searchIsSimple = issimple; @@ -733,11 +702,11 @@ void RclMain::startSearch(STD_SHARED_PTR sdata, bool issimple) curPreview = 0; DocSequenceDb *src = - new DocSequenceDb(STD_SHARED_PTR(query), + new DocSequenceDb(std::shared_ptr(query), string(tr("Query results").toUtf8()), sdata); src->setAbstractParams(prefs.queryBuildAbstract, prefs.queryReplaceAbstract); - m_source = STD_SHARED_PTR(src); + m_source = std::shared_ptr(src); m_source->setSortSpec(m_sortspec); m_source->setFiltSpec(m_filtspec); @@ -747,9 +716,9 @@ void RclMain::startSearch(STD_SHARED_PTR sdata, bool issimple) } class QueryThread : public QThread { - STD_SHARED_PTR m_source; + std::shared_ptr m_source; public: - QueryThread(STD_SHARED_PTR source) + QueryThread(std::shared_ptr source) : m_source(source) { } @@ -961,8 +930,8 @@ void RclMain::showSubDocs(Rcl::Doc doc) new DocSequenceDocs(rcldb, docs, qs2utf8s(tr("Sub-documents and attachments"))); src->setDescription(qs2utf8s(tr("Sub-documents and attachments"))); - STD_SHARED_PTR - source(new DocSource(theconfig, STD_SHARED_PTR(src))); + std::shared_ptr + source(new DocSource(theconfig, std::shared_ptr(src))); ResTable *res = new ResTable(); res->setRclMain(this, false); @@ -1003,7 +972,7 @@ void RclMain::showDocHistory() { LOGDEB("RclMain::showDocHistory\n" ); emit searchReset(); - m_source = STD_SHARED_PTR(); + m_source = std::shared_ptr(); curPreview = 0; string reason; @@ -1012,8 +981,8 @@ void RclMain::showDocHistory() return; } // Construct a bogus SearchData structure - STD_SHARED_PTRsearchdata = - STD_SHARED_PTR(new Rcl::SearchData(Rcl::SCLT_AND, cstr_null)); + std::shared_ptrsearchdata = + std::shared_ptr(new Rcl::SearchData(Rcl::SCLT_AND, cstr_null)); searchdata->setDescription((const char *)tr("History data").toUtf8()); @@ -1022,8 +991,8 @@ void RclMain::showDocHistory() new DocSequenceHistory(rcldb, g_dynconf, string(tr("Document history").toUtf8())); src->setDescription((const char *)tr("History data").toUtf8()); - DocSource *source = new DocSource(theconfig, STD_SHARED_PTR(src)); - m_source = STD_SHARED_PTR(source); + DocSource *source = new DocSource(theconfig, std::shared_ptr(src)); + m_source = std::shared_ptr(source); m_source->setSortSpec(m_sortspec); m_source->setFiltSpec(m_filtspec); emit docSourceChanged(m_source); diff --git a/src/qtgui/rclmain_w.h b/src/qtgui/rclmain_w.h index 1df1096b..5de6dbb8 100644 --- a/src/qtgui/rclmain_w.h +++ b/src/qtgui/rclmain_w.h @@ -30,7 +30,7 @@ #include "rcldb.h" #include "searchdata.h" #include "spell_w.h" -#include MEMORY_INCLUDE +#include #include "pathut.h" #include "guiutils.h" @@ -123,7 +123,7 @@ public slots: virtual void toggleIndexing(); virtual void rebuildIndex(); virtual void specialIndex(); - virtual void startSearch(STD_SHARED_PTR sdata, + virtual void startSearch(std::shared_ptr sdata, bool issimple); virtual void previewClosed(Preview *w); virtual void showAdvSearchDialog(); @@ -189,7 +189,7 @@ private slots: virtual void updateIdxStatus(); virtual void onWebcacheDestroyed(QObject *); signals: - void docSourceChanged(STD_SHARED_PTR); + void docSourceChanged(std::shared_ptr); void stemLangChanged(const QString& lang); void sortDataChanged(DocSeqSortSpec); void resultsReady(); @@ -233,7 +233,7 @@ private: DocSeqFiltSpec m_filtspec; bool m_sortspecnochange; DocSeqSortSpec m_sortspec; - STD_SHARED_PTR m_source; + std::shared_ptr m_source; IndexerState m_indexerState; bool m_queryActive; bool m_firstIndexing; diff --git a/src/qtgui/reslist.cpp b/src/qtgui/reslist.cpp index 9eb47ea4..f8ec4751 100644 --- a/src/qtgui/reslist.cpp +++ b/src/qtgui/reslist.cpp @@ -47,7 +47,7 @@ #include "pathut.h" #include "mimehandler.h" #include "plaintorich.h" -#include MEMORY_INCLUDE +#include #include "internfile.h" #include "indexer.h" #include "snippets_w.h" @@ -421,10 +421,10 @@ int ResList::newListId() extern "C" int XFlush(void *); -void ResList::setDocSource(STD_SHARED_PTR nsource) +void ResList::setDocSource(std::shared_ptr nsource) { LOGDEB("ResList::setDocSource()\n" ); - m_source = STD_SHARED_PTR(new DocSource(theconfig, nsource)); + m_source = std::shared_ptr(new DocSource(theconfig, nsource)); } // A query was executed, or the filtering/sorting parameters changed, @@ -447,7 +447,7 @@ void ResList::readDocSource() void ResList::resetList() { LOGDEB("ResList::resetList()\n" ); - setDocSource(STD_SHARED_PTR()); + setDocSource(std::shared_ptr()); resetView(); } @@ -900,7 +900,7 @@ void ResList::linkWasClicked(const QUrl &url) LOGERR("ResList::linkWasClicked: can't get doc for " << (i) << "\n" ); return; } - emit editRequested(ResultPopup::getParent(STD_SHARED_PTR(), + emit editRequested(ResultPopup::getParent(std::shared_ptr(), doc)); } break; diff --git a/src/qtgui/reslist.h b/src/qtgui/reslist.h index f15b7921..f8254d03 100644 --- a/src/qtgui/reslist.h +++ b/src/qtgui/reslist.h @@ -33,7 +33,7 @@ #include "docseq.h" #include "sortseq.h" #include "filtseq.h" -#include MEMORY_INCLUDE +#include #include "rcldoc.h" #include "reslistpager.h" @@ -66,7 +66,7 @@ class ResList : public RESLIST_PARENTCLASS void setRclMain(RclMain *m, bool ismain); public slots: - virtual void setDocSource(STD_SHARED_PTR nsource); + virtual void setDocSource(std::shared_ptr nsource); virtual void resetList(); // Erase current list virtual void resPageUpOrBack(); // Page up pressed virtual void resPageDownOrNext(); // Page down pressed @@ -118,7 +118,7 @@ class ResList : public RESLIST_PARENTCLASS private: QtGuiResListPager *m_pager; - STD_SHARED_PTR m_source; + std::shared_ptr m_source; int m_popDoc; // Docnum for the popup menu. int m_curPvDoc;// Docnum for current preview int m_lstClckMod; // Last click modifier. diff --git a/src/qtgui/respopup.cpp b/src/qtgui/respopup.cpp index 5c861743..509ea108 100644 --- a/src/qtgui/respopup.cpp +++ b/src/qtgui/respopup.cpp @@ -29,7 +29,7 @@ namespace ResultPopup { -QMenu *create(QWidget *me, int opts, STD_SHARED_PTR source, Rcl::Doc& doc) +QMenu *create(QWidget *me, int opts, std::shared_ptr source, Rcl::Doc& doc) { QMenu *popup = new QMenu(me); @@ -134,7 +134,7 @@ QMenu *create(QWidget *me, int opts, STD_SHARED_PTR source, Rcl::Do return popup; } -Rcl::Doc getParent(STD_SHARED_PTR source, Rcl::Doc& doc) +Rcl::Doc getParent(std::shared_ptr source, Rcl::Doc& doc) { Rcl::Doc pdoc; if (!source || !source->getEnclosing(doc, pdoc)) { diff --git a/src/qtgui/respopup.h b/src/qtgui/respopup.h index 87936a08..3dd9c464 100644 --- a/src/qtgui/respopup.h +++ b/src/qtgui/respopup.h @@ -22,9 +22,9 @@ namespace ResultPopup { enum Options {showExpand = 0x1, showSubs = 0x2, isMain = 0x3, showSaveOne = 0x4, showSaveSel = 0x8}; extern QMenu *create(QWidget *me, int opts, - STD_SHARED_PTR source, + std::shared_ptr source, Rcl::Doc& doc); - extern Rcl::Doc getParent(STD_SHARED_PTR source, + extern Rcl::Doc getParent(std::shared_ptr source, Rcl::Doc& doc); extern void copyFN(const Rcl::Doc &doc); extern void copyURL(const Rcl::Doc &doc); diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp index 9b8b901d..0e042323 100644 --- a/src/qtgui/restable.cpp +++ b/src/qtgui/restable.cpp @@ -35,7 +35,7 @@ #include #include "recoll.h" -#include MEMORY_INCLUDE +#include #include "docseq.h" #include "log.h" #include "restable.h" @@ -290,13 +290,13 @@ void RecollModel::readDocSource() endResetModel(); } -void RecollModel::setDocSource(STD_SHARED_PTR nsource) +void RecollModel::setDocSource(std::shared_ptr nsource) { LOGDEB("RecollModel::setDocSource\n" ); if (!nsource) { - m_source = STD_SHARED_PTR(); + m_source = std::shared_ptr(); } else { - m_source = STD_SHARED_PTR(new DocSource(theconfig, nsource)); + m_source = std::shared_ptr(new DocSource(theconfig, nsource)); m_hdata.clear(); m_source->getTerms(m_hdata); } @@ -661,7 +661,7 @@ void ResTable::takeFocus() tableView->setFocus(Qt::ShortcutFocusReason); } -void ResTable::setDocSource(STD_SHARED_PTR nsource) +void ResTable::setDocSource(std::shared_ptr nsource) { LOGDEB("ResTable::setDocSource\n" ); if (m_model) @@ -676,7 +676,7 @@ void ResTable::setDocSource(STD_SHARED_PTR nsource) void ResTable::resetSource() { LOGDEB("ResTable::resetSource\n" ); - setDocSource(STD_SHARED_PTR()); + setDocSource(std::shared_ptr()); } void ResTable::saveAsCSV() @@ -777,7 +777,7 @@ void ResTable::linkWasClicked(const QUrl &url) // Open parent folder case 'F': { - emit editRequested(ResultPopup::getParent(STD_SHARED_PTR(), + emit editRequested(ResultPopup::getParent(std::shared_ptr(), m_detaildoc)); } break; diff --git a/src/qtgui/restable.h b/src/qtgui/restable.h index f72c7e1d..d032939e 100644 --- a/src/qtgui/restable.h +++ b/src/qtgui/restable.h @@ -23,7 +23,7 @@ #include #include #include -#include MEMORY_INCLUDE +#include #include "ui_restable.h" #include "docseq.h" @@ -51,8 +51,8 @@ public: virtual void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); // Specific methods virtual void readDocSource(); - virtual void setDocSource(STD_SHARED_PTR nsource); - virtual STD_SHARED_PTR getDocSource() {return m_source;} + virtual void setDocSource(std::shared_ptr nsource); + virtual std::shared_ptr getDocSource() {return m_source;} virtual void deleteColumn(int); virtual const std::vector& getFields() {return m_fields;} virtual const std::map& getAllFields() @@ -73,7 +73,7 @@ signals: void sortDataChanged(DocSeqSortSpec); private: - mutable STD_SHARED_PTR m_source; + mutable std::shared_ptr m_source; std::vector m_fields; std::vector m_getters; static std::map o_displayableFields; @@ -127,7 +127,7 @@ public: public slots: virtual void onTableView_currentChanged(const QModelIndex&); virtual void on_tableView_entered(const QModelIndex& index); - virtual void setDocSource(STD_SHARED_PTR nsource); + virtual void setDocSource(std::shared_ptr nsource); virtual void saveColState(); virtual void resetSource(); virtual void readDocSource(bool resetPos = true); diff --git a/src/qtgui/snippets_w.h b/src/qtgui/snippets_w.h index fbbb3eaf..8c7dff86 100644 --- a/src/qtgui/snippets_w.h +++ b/src/qtgui/snippets_w.h @@ -19,7 +19,7 @@ #include "autoconfig.h" -#include MEMORY_INCLUDE +#include #include @@ -33,7 +33,7 @@ class SnippetsW : public QWidget, public Ui::Snippets { Q_OBJECT public: - SnippetsW(Rcl::Doc doc, STD_SHARED_PTR source, QWidget* parent = 0) + SnippetsW(Rcl::Doc doc, std::shared_ptr source, QWidget* parent = 0) : QWidget(parent), m_doc(doc), m_source(source) { setupUi((QDialog*)this); @@ -52,7 +52,7 @@ signals: private: void init(); Rcl::Doc m_doc; - STD_SHARED_PTR m_source; + std::shared_ptr m_source; }; #endif /* _SNIPPETS_W_H_INCLUDED_ */ diff --git a/src/qtgui/spell_w.cpp b/src/qtgui/spell_w.cpp index 67f7d6f8..4d743f6e 100644 --- a/src/qtgui/spell_w.cpp +++ b/src/qtgui/spell_w.cpp @@ -362,7 +362,7 @@ void SpellW::showStats() string reason; string q = string("mime:") + *it; Rcl::SearchData *sd = wasaStringToRcl(theconfig, "", q, reason); - STD_SHARED_PTR rq(sd); + std::shared_ptr rq(sd); Rcl::Query query(rcldb); if (!query.setQuery(rq)) { LOGERR("Query setup failed: " << (query.getReason()) << "" ); diff --git a/src/qtgui/ssearch_w.cpp b/src/qtgui/ssearch_w.cpp index 7b247913..aa7bb01c 100644 --- a/src/qtgui/ssearch_w.cpp +++ b/src/qtgui/ssearch_w.cpp @@ -18,7 +18,7 @@ #include #include -#include MEMORY_INCLUDE +#include #include #include @@ -309,7 +309,7 @@ bool SSearch::startSimpleSearch(const string& u8, int maxexp) m_xml = xml.str(); LOGDEB("SSearch::startSimpleSearch:xml:[" << (m_xml) << "]\n" ); - STD_SHARED_PTR rsdata(sdata); + std::shared_ptr rsdata(sdata); emit startSearch(rsdata, true); return true; } diff --git a/src/qtgui/ssearch_w.h b/src/qtgui/ssearch_w.h index ba90ce73..91d721eb 100644 --- a/src/qtgui/ssearch_w.h +++ b/src/qtgui/ssearch_w.h @@ -27,7 +27,7 @@ class QTimer; #include "recoll.h" #include "searchdata.h" -#include MEMORY_INCLUDE +#include #include "ui_ssearchb.h" @@ -73,7 +73,7 @@ public slots: virtual void takeFocus(); signals: - void startSearch(STD_SHARED_PTR, bool); + void startSearch(std::shared_ptr, bool); void clearSearch(); private: bool m_escape; diff --git a/src/qtgui/webcache.cpp b/src/qtgui/webcache.cpp index b9d9a53c..2c75bd46 100644 --- a/src/qtgui/webcache.cpp +++ b/src/qtgui/webcache.cpp @@ -18,8 +18,8 @@ #include #include -#include MEMORY_INCLUDE -#include UNORDERED_MAP_INCLUDE +#include +#include #ifdef _WIN32 #define USING_STD_REGEX @@ -62,7 +62,7 @@ public: class WebcacheModelInternal { public: - STD_SHARED_PTR cache; + std::shared_ptr cache; vector all; vector disp; }; @@ -81,7 +81,7 @@ WebcacheModel::~WebcacheModel() void WebcacheModel::reload() { m->cache = - STD_SHARED_PTR(new BeagleQueueCache(theconfig)); + std::shared_ptr(new BeagleQueueCache(theconfig)); m->all.clear(); m->disp.clear(); diff --git a/src/qtgui/webcache.h b/src/qtgui/webcache.h index f428f503..c0b3a900 100644 --- a/src/qtgui/webcache.h +++ b/src/qtgui/webcache.h @@ -20,7 +20,7 @@ #include #include -#include MEMORY_INCLUDE +#include #include "ui_webcache.h" diff --git a/src/qtgui/xmltosd.h b/src/qtgui/xmltosd.h index 43bacf06..35d13e55 100644 --- a/src/qtgui/xmltosd.h +++ b/src/qtgui/xmltosd.h @@ -60,12 +60,12 @@ * */ -#include MEMORY_INCLUDE +#include #include "searchdata.h" // Parsing XML from advanced search history or saved advanced search to to // SearchData structure: -STD_SHARED_PTR xmlToSearchData(const string& xml); +std::shared_ptr xmlToSearchData(const string& xml); // Parsing XML from saved simple search to ssearch parameters struct SSearchDef { diff --git a/src/query/docseq.cpp b/src/query/docseq.cpp index ec061b0e..163926c0 100644 --- a/src/query/docseq.cpp +++ b/src/query/docseq.cpp @@ -82,7 +82,7 @@ bool DocSource::buildStack() } else { if (m_fspec.isNotNull()) { m_seq = - STD_SHARED_PTR(new DocSeqFiltered(m_config, m_seq, m_fspec)); + std::shared_ptr(new DocSeqFiltered(m_config, m_seq, m_fspec)); } } @@ -92,7 +92,7 @@ bool DocSource::buildStack() } } else { if (m_sspec.isNotNull()) { - m_seq = STD_SHARED_PTR(new DocSeqSorted(m_seq, m_sspec)); + m_seq = std::shared_ptr(new DocSeqSorted(m_seq, m_sspec)); } } return true; diff --git a/src/query/docseq.h b/src/query/docseq.h index 3a37d852..e787ef3b 100644 --- a/src/query/docseq.h +++ b/src/query/docseq.h @@ -155,7 +155,7 @@ class DocSequence { virtual bool canSort() {return false;} virtual bool setFiltSpec(const DocSeqFiltSpec &) {return false;} virtual bool setSortSpec(const DocSeqSortSpec &) {return false;} - virtual STD_SHARED_PTR getSourceSeq() {return STD_SHARED_PTR();} + virtual std::shared_ptr getSourceSeq() {return std::shared_ptr();} static void set_translations(const std::string& sort, const std::string& filt) { @@ -181,7 +181,7 @@ protected: */ class DocSeqModifier : public DocSequence { public: - DocSeqModifier(STD_SHARED_PTR iseq) + DocSeqModifier(std::shared_ptr iseq) : DocSequence(""), m_seq(iseq) {} virtual ~DocSeqModifier() {} @@ -241,7 +241,7 @@ public: { return m_seq->title(); } - virtual STD_SHARED_PTR getSourceSeq() + virtual std::shared_ptr getSourceSeq() { return m_seq; } @@ -254,7 +254,7 @@ protected: return m_seq->getDb(); } - STD_SHARED_PTR m_seq; + std::shared_ptr m_seq; }; class RclConfig; @@ -263,7 +263,7 @@ class RclConfig; // sorting and filtering in ways depending on the base seqs capabilities class DocSource : public DocSeqModifier { public: - DocSource(RclConfig *config, STD_SHARED_PTR iseq) + DocSource(RclConfig *config, std::shared_ptr iseq) : DocSeqModifier(iseq), m_config(config) {} virtual bool canFilter() {return true;} diff --git a/src/query/docseqdb.cpp b/src/query/docseqdb.cpp index 4d119bd0..4ae37edc 100644 --- a/src/query/docseqdb.cpp +++ b/src/query/docseqdb.cpp @@ -28,8 +28,8 @@ using std::list; -DocSequenceDb::DocSequenceDb(STD_SHARED_PTR q, const string &t, - STD_SHARED_PTR sdata) +DocSequenceDb::DocSequenceDb(std::shared_ptr q, const string &t, + std::shared_ptr sdata) : DocSequence(t), m_q(q), m_sdata(sdata), m_fsdata(sdata), m_rescnt(-1), m_queryBuildAbstract(true), @@ -164,7 +164,7 @@ bool DocSequenceDb::setFiltSpec(const DocSeqFiltSpec &fs) std::unique_lock locker(o_dblock); if (fs.isNotNull()) { // We build a search spec by adding a filtering layer to the base one. - m_fsdata = STD_SHARED_PTR( + m_fsdata = std::shared_ptr( new Rcl::SearchData(Rcl::SCLT_AND, m_sdata->getStemLang())); Rcl::SearchDataClauseSub *cl = new Rcl::SearchDataClauseSub(m_sdata); @@ -188,7 +188,7 @@ bool DocSequenceDb::setFiltSpec(const DocSeqFiltSpec &fs) if (sd) { Rcl::SearchDataClauseSub *cl1 = new Rcl::SearchDataClauseSub( - STD_SHARED_PTR(sd)); + std::shared_ptr(sd)); m_fsdata->addClause(cl1); } } diff --git a/src/query/docseqdb.h b/src/query/docseqdb.h index b36f159a..882cc5a6 100644 --- a/src/query/docseqdb.h +++ b/src/query/docseqdb.h @@ -17,7 +17,7 @@ #ifndef _DOCSEQDB_H_INCLUDED_ #define _DOCSEQDB_H_INCLUDED_ #include "docseq.h" -#include MEMORY_INCLUDE +#include #include "searchdata.h" #include "rclquery.h" @@ -25,8 +25,8 @@ /** A DocSequence from a Db query */ class DocSequenceDb : public DocSequence { public: - DocSequenceDb(STD_SHARED_PTR q, const string &t, - STD_SHARED_PTR sdata); + DocSequenceDb(std::shared_ptr q, const string &t, + std::shared_ptr sdata); virtual ~DocSequenceDb() {} virtual bool getDoc(int num, Rcl::Doc &doc, string * = 0); virtual int getResCnt(); @@ -60,9 +60,9 @@ class DocSequenceDb : public DocSequence { protected: virtual Rcl::Db *getDb(); private: - STD_SHARED_PTR m_q; - STD_SHARED_PTR m_sdata; - STD_SHARED_PTR m_fsdata; // Filtered + std::shared_ptr m_q; + std::shared_ptr m_sdata; + std::shared_ptr m_fsdata; // Filtered int m_rescnt; bool m_queryBuildAbstract; bool m_queryReplaceAbstract; diff --git a/src/query/filtseq.cpp b/src/query/filtseq.cpp index 02f14871..5b00d8fc 100644 --- a/src/query/filtseq.cpp +++ b/src/query/filtseq.cpp @@ -46,7 +46,7 @@ static bool filter(const DocSeqFiltSpec& fs, const Rcl::Doc *x) return false; } -DocSeqFiltered::DocSeqFiltered(RclConfig *conf, STD_SHARED_PTR iseq, +DocSeqFiltered::DocSeqFiltered(RclConfig *conf, std::shared_ptr iseq, DocSeqFiltSpec &filtspec) : DocSeqModifier(iseq), m_config(conf) { diff --git a/src/query/filtseq.h b/src/query/filtseq.h index 1eae62d1..c9ceab77 100644 --- a/src/query/filtseq.h +++ b/src/query/filtseq.h @@ -20,7 +20,7 @@ #include #include -#include MEMORY_INCLUDE +#include #include "docseq.h" @@ -32,7 +32,7 @@ class RclConfig; */ class DocSeqFiltered : public DocSeqModifier { public: - DocSeqFiltered(RclConfig *conf, STD_SHARED_PTR iseq, + DocSeqFiltered(RclConfig *conf, std::shared_ptr iseq, DocSeqFiltSpec &filtspec); virtual ~DocSeqFiltered() {} virtual bool canFilter() {return true;} diff --git a/src/query/recollq.cpp b/src/query/recollq.cpp index 22c4bb7b..ac4472df 100644 --- a/src/query/recollq.cpp +++ b/src/query/recollq.cpp @@ -342,7 +342,7 @@ endopts: return 1; } - STD_SHARED_PTR rq(sd); + std::shared_ptr rq(sd); Rcl::Query query(&rcldb); if (op_flags & OPT_S) { query.setSortBy(sortfield, (op_flags & OPT_D) ? false : true); diff --git a/src/query/reslistpager.h b/src/query/reslistpager.h index 5817af20..087e307d 100644 --- a/src/query/reslistpager.h +++ b/src/query/reslistpager.h @@ -20,7 +20,7 @@ #include "autoconfig.h" #include -#include MEMORY_INCLUDE +#include #include "docseq.h" #include "hldata.h" @@ -40,7 +40,7 @@ public: { m_hiliter = ptr; } - void setDocSource(STD_SHARED_PTR src, int winfirst = -1) + void setDocSource(std::shared_ptr src, int winfirst = -1) { m_pagesize = m_newpagesize; m_winfirst = winfirst; @@ -129,7 +129,7 @@ private: int m_winfirst; bool m_hasNext; PlainToRich *m_hiliter; - STD_SHARED_PTR m_docSource; + std::shared_ptr m_docSource; std::vector m_respage; }; diff --git a/src/query/sortseq.h b/src/query/sortseq.h index da660a54..c8ebeb2b 100644 --- a/src/query/sortseq.h +++ b/src/query/sortseq.h @@ -20,7 +20,7 @@ #include #include -#include MEMORY_INCLUDE +#include #include "docseq.h" @@ -30,7 +30,7 @@ */ class DocSeqSorted : public DocSeqModifier { public: - DocSeqSorted(STD_SHARED_PTR iseq, DocSeqSortSpec &sortspec) + DocSeqSorted(std::shared_ptr iseq, DocSeqSortSpec &sortspec) : DocSeqModifier(iseq) { setSortSpec(sortspec); diff --git a/src/query/wasaparse.cpp b/src/query/wasaparse.cpp index af2cd5ed..81293f3e 100644 --- a/src/query/wasaparse.cpp +++ b/src/query/wasaparse.cpp @@ -65,7 +65,7 @@ static void addSubQuery(WasaParserDriver *d, { if (sd && sq) sd->addClause( - new Rcl::SearchDataClauseSub(STD_SHARED_PTR(sq))); + new Rcl::SearchDataClauseSub(std::shared_ptr(sq))); } diff --git a/src/rcldb/expansiondbs.cpp b/src/rcldb/expansiondbs.cpp index 435fdc3e..04f60b48 100644 --- a/src/rcldb/expansiondbs.cpp +++ b/src/rcldb/expansiondbs.cpp @@ -18,7 +18,7 @@ #include "autoconfig.h" -#include MEMORY_INCLUDE +#include #include "log.h" #include "utf8iter.h" @@ -57,9 +57,9 @@ bool createExpansionDbs(Xapian::WritableDatabase& wdb, vector stemdbs; // Note: tried to make this to work with stack-allocated objects, couldn't. // Looks like a bug in copy constructors somewhere, can't guess where - vector > stemmers; + vector > stemmers; for (unsigned int i = 0; i < langs.size(); i++) { - stemmers.push_back(STD_SHARED_PTR + stemmers.push_back(std::shared_ptr (new SynTermTransStem(langs[i]))); stemdbs.push_back( XapWritableComputableSynFamMember(wdb, synFamStem, langs[i], diff --git a/src/rcldb/rclabstract.cpp b/src/rcldb/rclabstract.cpp index 42678dbc..1445a916 100644 --- a/src/rcldb/rclabstract.cpp +++ b/src/rcldb/rclabstract.cpp @@ -357,7 +357,7 @@ int Query::Native::makeAbstract(Xapian::docid docid, map sparseDoc; // Also remember apart the search term positions so that we can list // them with their snippets. - STD_UNORDERED_SET searchTermPositions; + std::unordered_set searchTermPositions; // Remember max position. Used to stop walking positions lists while // populating the adjacent slots. diff --git a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp index 3f8943e1..bc571e3e 100644 --- a/src/rcldb/rcldb.cpp +++ b/src/rcldb/rcldb.cpp @@ -572,7 +572,7 @@ bool Db::Native::addOrUpdateWrite(const string& udi, const string& uniterm, Chrono chron; std::unique_lock lock(m_mutex); #endif - STD_SHARED_PTR doc_cleaner(newdocument_ptr); + std::shared_ptr doc_cleaner(newdocument_ptr); // Check file system full every mbyte of indexed text. It's a bit wasteful // to do this after having prepared the document, but it needs to be in diff --git a/src/rcldb/rcldb.h b/src/rcldb/rcldb.h index 38f34e39..e8e4b577 100644 --- a/src/rcldb/rcldb.h +++ b/src/rcldb/rcldb.h @@ -21,7 +21,7 @@ #include #include -#include MEMORY_INCLUDE +#include #include "cstr.h" #include "rcldoc.h" diff --git a/src/rcldb/rcldups.cpp b/src/rcldb/rcldups.cpp index cbed6f82..8519fce7 100644 --- a/src/rcldb/rcldups.cpp +++ b/src/rcldb/rcldups.cpp @@ -70,7 +70,7 @@ bool Db::docDups(const Doc& idoc, vector& odocs) MD5HexPrint(digest, md5); SearchData *sdp = new SearchData(); - STD_SHARED_PTR sd(sdp); + std::shared_ptr sd(sdp); SearchDataClauseSimple *sdc = new SearchDataClauseSimple(SCLT_AND, md5, "rclmd5"); sdc->addModifier(SearchDataClause::SDCM_CASESENS); diff --git a/src/rcldb/rclquery.cpp b/src/rcldb/rclquery.cpp index 95bc26ac..13c20a8a 100644 --- a/src/rcldb/rclquery.cpp +++ b/src/rcldb/rclquery.cpp @@ -173,7 +173,7 @@ void Query::setSortBy(const string& fld, bool ascending) { #define ISNULL(X) !(X) // Prepare query out of user search data -bool Query::setQuery(STD_SHARED_PTR sdata) +bool Query::setQuery(std::shared_ptr sdata) { LOGDEB("Query::setQuery:\n" ); diff --git a/src/rcldb/rclquery.h b/src/rcldb/rclquery.h index 9286c09c..2bb6c43a 100644 --- a/src/rcldb/rclquery.h +++ b/src/rcldb/rclquery.h @@ -19,7 +19,7 @@ #include #include -#include MEMORY_INCLUDE +#include #include "searchdata.h" #ifndef NO_NAMESPACES @@ -92,7 +92,7 @@ class Query { * be called repeatedly on the same object which gets reinitialized each * time. */ - bool setQuery(STD_SHARED_PTR q); + bool setQuery(std::shared_ptr q); /** Get results count for current query */ int getResCnt(); @@ -117,7 +117,7 @@ class Query { int getFirstMatchPage(const Doc &doc, std::string& term); /** Retrieve a reference to the searchData we are using */ - STD_SHARED_PTR getSD() + std::shared_ptr getSD() { return m_sd; } @@ -143,7 +143,7 @@ private: bool m_sortAscending; bool m_collapseDuplicates; int m_resCnt; - STD_SHARED_PTR m_sd; + std::shared_ptr m_sd; int m_snipMaxPosWalk; /* Copyconst and assignement private and forbidden */ diff --git a/src/rcldb/rclterms.cpp b/src/rcldb/rclterms.cpp index c8f77230..d83fe2cc 100644 --- a/src/rcldb/rclterms.cpp +++ b/src/rcldb/rclterms.cpp @@ -185,11 +185,11 @@ bool Db::termMatch(int typ_sens, const string &lang, const string &_term, XapComputableSynFamMember synac(xrdb, synFamDiCa, "all", &unacfoldtrans); if (matchtyp == ET_WILD || matchtyp == ET_REGEXP) { - STD_SHARED_PTR matcher; + std::shared_ptr matcher; if (matchtyp == ET_WILD) { - matcher = STD_SHARED_PTR(new StrWildMatcher(term)); + matcher = std::shared_ptr(new StrWildMatcher(term)); } else { - matcher = STD_SHARED_PTR(new StrRegexpMatcher(term)); + matcher = std::shared_ptr(new StrRegexpMatcher(term)); } if (!diac_sensitive || !case_sensitive) { // Perform case/diac expansion on the exp as appropriate and @@ -355,15 +355,15 @@ bool Db::idxTermMatch(int typ_sens, const string &lang, const string &root, } res.prefix = prefix; - STD_SHARED_PTR matcher; + std::shared_ptr matcher; if (typ == ET_REGEXP) { - matcher = STD_SHARED_PTR(new StrRegexpMatcher(root)); + matcher = std::shared_ptr(new StrRegexpMatcher(root)); if (!matcher->ok()) { LOGERR("termMatch: regcomp failed: " << (matcher->getreason())); return false; } } else if (typ == ET_WILD) { - matcher = STD_SHARED_PTR(new StrWildMatcher(root)); + matcher = std::shared_ptr(new StrWildMatcher(root)); } // Find the initial section before any special char diff --git a/src/rcldb/searchdata.cpp b/src/rcldb/searchdata.cpp index 4cfcbf76..8520d925 100644 --- a/src/rcldb/searchdata.cpp +++ b/src/rcldb/searchdata.cpp @@ -162,7 +162,7 @@ bool SearchData::maybeAddAutoPhrase(Rcl::Db& db, double freqThreshold) // an actual user-entered phrase slack += 1 + nwords / 3; - m_autophrase = STD_SHARED_PTR( + m_autophrase = std::shared_ptr( new SearchDataClauseDist(SCLT_PHRASE, swords, slack, field)); return true; } diff --git a/src/rcldb/searchdata.h b/src/rcldb/searchdata.h index 26653aa1..cbabdb44 100644 --- a/src/rcldb/searchdata.h +++ b/src/rcldb/searchdata.h @@ -29,7 +29,7 @@ #include #include "rcldb.h" -#include MEMORY_INCLUDE +#include #include "smallut.h" #include "cstr.h" #include "hldata.h" @@ -178,7 +178,7 @@ private: std::vector m_nfiletypes; // Autophrase if set. Can't be part of the normal chain because // it uses OP_AND_MAYBE - STD_SHARED_PTR m_autophrase; + std::shared_ptr m_autophrase; // Special stuff produced by input which looks like a clause but means // something else (date and size specs) @@ -493,7 +493,7 @@ private: /** Subquery */ class SearchDataClauseSub : public SearchDataClause { public: - SearchDataClauseSub(STD_SHARED_PTR sub) + SearchDataClauseSub(std::shared_ptr sub) : SearchDataClause(SCLT_SUB), m_sub(sub) { } @@ -509,13 +509,13 @@ public: { m_sub.get()->getTerms(hldata); } - virtual STD_SHARED_PTR getSub() { + virtual std::shared_ptr getSub() { return m_sub; } virtual void dump(ostream& o) const; protected: - STD_SHARED_PTR m_sub; + std::shared_ptr m_sub; }; } // Namespace Rcl diff --git a/src/rcldb/synfamily.cpp b/src/rcldb/synfamily.cpp index 03ece295..ec752615 100644 --- a/src/rcldb/synfamily.cpp +++ b/src/rcldb/synfamily.cpp @@ -20,7 +20,7 @@ #include #include -#include MEMORY_INCLUDE +#include #include "log.h" #include "cstr.h" @@ -183,9 +183,9 @@ bool XapComputableSynFamMember::synKeyExpand(StrMatcher* inexp, LOGDEB("XapCompSynFam::synKeyExpand: [" << (inexp->exp()) << "]\n" ); // If set, compute filtering term (e.g.: only case-folded) - STD_SHARED_PTR filter_exp; + std::shared_ptr filter_exp; if (filtertrans) { - filter_exp = STD_SHARED_PTR(inexp->clone()); + filter_exp = std::shared_ptr(inexp->clone()); filter_exp->setExp((*filtertrans)(inexp->exp())); } diff --git a/src/utils/circache.cpp b/src/utils/circache.cpp index ae00849b..0b4699fc 100644 --- a/src/utils/circache.cpp +++ b/src/utils/circache.cpp @@ -30,7 +30,7 @@ #include #include "chrono.h" -#include MEMORY_INCLUDE +#include #ifndef _WIN32 @@ -1353,8 +1353,8 @@ static bool inflateToDynBuf(void* inp, UINT inlen, void **outpp, UINT *outlenp) } // Copy all entries from occ to ncc. Both are already open. -static bool copyall(STD_SHARED_PTR occ, - STD_SHARED_PTR ncc, int& nentries, +static bool copyall(std::shared_ptr occ, + std::shared_ptr ncc, int& nentries, ostringstream& msg) { bool eof = false; @@ -1399,7 +1399,7 @@ int CirCache::append(const string ddir, const string& sdir, string *reason) { ostringstream msg; // Open source file - STD_SHARED_PTR occ(new CirCache(sdir)); + std::shared_ptr occ(new CirCache(sdir)); if (!occ->open(CirCache::CC_OPREAD)) { if (reason) { msg << "Open failed in " << sdir << " : " << @@ -1409,7 +1409,7 @@ int CirCache::append(const string ddir, const string& sdir, string *reason) return -1; } // Open dest file - STD_SHARED_PTR ncc(new CirCache(ddir)); + std::shared_ptr ncc(new CirCache(ddir)); if (!ncc->open(CirCache::CC_OPWRITE)) { if (reason) { msg << "Open failed in " << ddir << " : " << @@ -1444,7 +1444,7 @@ int CirCache::append(const string ddir, const string& sdir, string *reason) #include #include -#include MEMORY_INCLUDE +#include #include "circache.h" #include "fileudi.h" diff --git a/src/utils/execmd.cpp b/src/utils/execmd.cpp index feba4945..0db9032b 100644 --- a/src/utils/execmd.cpp +++ b/src/utils/execmd.cpp @@ -77,10 +77,10 @@ public: string m_stderrFile; // Pipe for data going to the command int m_pipein[2]; - STD_SHARED_PTR m_tocmd; + std::shared_ptr m_tocmd; // Pipe for data coming out int m_pipeout[2]; - STD_SHARED_PTR m_fromcmd; + std::shared_ptr m_fromcmd; // Subprocess id pid_t m_pid; // Saved sigmask @@ -642,14 +642,14 @@ int ExecCmd::startExec(const string& cmd, const vector& args, m->m_pipein[0] = -1; NetconCli *iclicon = new NetconCli(); iclicon->setconn(m->m_pipein[1]); - m->m_tocmd = STD_SHARED_PTR(iclicon); + m->m_tocmd = std::shared_ptr(iclicon); } if (has_output) { close(m->m_pipeout[1]); m->m_pipeout[1] = -1; NetconCli *oclicon = new NetconCli(); oclicon->setconn(m->m_pipeout[0]); - m->m_fromcmd = STD_SHARED_PTR(oclicon); + m->m_fromcmd = std::shared_ptr(oclicon); } /* Don't want to undo what we just did ! */ @@ -757,7 +757,7 @@ int ExecCmd::doexec(const string& cmd, const vector& args, LOGERR("ExecCmd::doexec: no connection from command\n"); return -1; } - oclicon->setcallback(STD_SHARED_PTR + oclicon->setcallback(std::shared_ptr (new ExecReader(output, m->m_advise))); myloop.addselcon(m->m_fromcmd, Netcon::NETCONPOLL_READ); // Give up ownership @@ -770,7 +770,7 @@ int ExecCmd::doexec(const string& cmd, const vector& args, LOGERR("ExecCmd::doexec: no connection from command\n"); return -1; } - iclicon->setcallback(STD_SHARED_PTR + iclicon->setcallback(std::shared_ptr (new ExecWriter(input, m->m_provide, m))); myloop.addselcon(m->m_tocmd, Netcon::NETCONPOLL_WRITE); // Give up ownership diff --git a/src/utils/netcon.cpp b/src/utils/netcon.cpp index a420fe96..5674cf3b 100644 --- a/src/utils/netcon.cpp +++ b/src/utils/netcon.cpp @@ -1208,8 +1208,8 @@ int trycli(char *host, char *serv) } } #else - STD_SHARED_PTR worker = - STD_SHARED_PTR(new CliNetconWorker()); + std::shared_ptr worker = + std::shared_ptr(new CliNetconWorker()); clicon->setcallback(worker); SelectLoop myloop; myloop.addselcon(con, Netcon::NETCONPOLL_WRITE); @@ -1274,8 +1274,8 @@ protected: if (con == 0) { return -1; } - STD_SHARED_PTR worker = - STD_SHARED_PTR(new ServNetconWorker()); + std::shared_ptr worker = + std::shared_ptr(new ServNetconWorker()); con->setcallback(worker); m_loop.addselcon(NetconP(con), NETCONPOLL_READ); return 1; diff --git a/src/utils/netcon.h b/src/utils/netcon.h index 9c39355e..5de75561 100644 --- a/src/utils/netcon.h +++ b/src/utils/netcon.h @@ -26,7 +26,7 @@ #include #include -#include MEMORY_INCLUDE +#include /// A set of classes to manage client-server communication over a /// connection-oriented network, or a pipe. @@ -43,7 +43,7 @@ /// Base class for all network endpoints: class Netcon; -typedef STD_SHARED_PTR NetconP; +typedef std::shared_ptr NetconP; class SelectLoop; class Netcon { @@ -246,7 +246,7 @@ public: virtual int getline(char *buf, int cnt, int timeo = -1); /// Set handler to be called when the connection is placed in the /// selectloop and an event occurs. - virtual void setcallback(STD_SHARED_PTR user) { + virtual void setcallback(std::shared_ptr user) { m_user = user; } @@ -255,7 +255,7 @@ private: char *m_bufbase; // Pointer to current 1st byte of useful data int m_bufbytes; // Bytes of data. int m_bufsize; // Total buffer size - STD_SHARED_PTR m_user; + std::shared_ptr m_user; virtual int cando(Netcon::Event reason); // Selectloop slot }; diff --git a/src/utils/rclutil.h b/src/utils/rclutil.h index 3084b9a3..106d69e2 100644 --- a/src/utils/rclutil.h +++ b/src/utils/rclutil.h @@ -23,7 +23,7 @@ #include #include -#include MEMORY_INCLUDE +#include extern void rclutil_init_mt(); @@ -70,7 +70,7 @@ private: bool m_noremove; }; -typedef STD_SHARED_PTR TempFile; +typedef std::shared_ptr TempFile; /// Temporary directory class. Recursively deleted by destructor. class TempDir { diff --git a/src/utils/smallut.cpp b/src/utils/smallut.cpp index 590e0233..3992fa86 100644 --- a/src/utils/smallut.cpp +++ b/src/utils/smallut.cpp @@ -42,8 +42,8 @@ #include #include #include -#include UNORDERED_MAP_INCLUDE -#include UNORDERED_SET_INCLUDE +#include +#include #include "smallut.h" @@ -323,8 +323,8 @@ template bool stringToStrings >(const string&, vector&, const string&); template bool stringToStrings >(const string&, set&, const string&); -template bool stringToStrings > -(const string&, STD_UNORDERED_SET&, const string&); +template bool stringToStrings > +(const string&, std::unordered_set&, const string&); template void stringsToString(const T& tokens, string& s) { @@ -1195,14 +1195,14 @@ static const string cstr_cp1252("CP1252"); string langtocode(const string& lang) { - static STD_UNORDERED_MAP lang_to_code; + static std::unordered_map lang_to_code; if (lang_to_code.empty()) { for (unsigned int i = 0; i < sizeof(vlang_to_code) / sizeof(char *); i += 2) { lang_to_code[vlang_to_code[i]] = vlang_to_code[i + 1]; } } - STD_UNORDERED_MAP::const_iterator it = + std::unordered_map::const_iterator it = lang_to_code.find(lang); // Use cp1252 by default... diff --git a/src/windows/execmd_w.cpp b/src/windows/execmd_w.cpp index 8c06fbb1..a5129cbc 100644 --- a/src/windows/execmd_w.cpp +++ b/src/windows/execmd_w.cpp @@ -23,7 +23,7 @@ #include #include #include -#include UNORDERED_MAP_INCLUDE +#include #include "log.h" #include "safesysstat.h" @@ -108,12 +108,12 @@ static string argvToCmdLine(const string& cmd, const vector& args) } // Merge the father environment with the variable specified in m_env -static char *mergeEnvironment(const STD_UNORDERED_MAP& addenv) +static char *mergeEnvironment(const std::unordered_map& addenv) { // Parse existing environment. char *envir = GetEnvironmentStrings(); char *cp0 = envir; - STD_UNORDERED_MAP envirmap; + std::unordered_map envirmap; string name, value; for (char *cp1 = cp0;;cp1++) { @@ -277,7 +277,7 @@ public: reset(); } - STD_UNORDERED_MAP m_env; + std::unordered_map m_env; ExecCmdAdvise *m_advise; ExecCmdProvide *m_provide; int m_timeoutMs;