diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp index f0750c61bd..f3511be8e5 100644 --- a/src/TocBackend.cpp +++ b/src/TocBackend.cpp @@ -155,7 +155,7 @@ Toc::iterator Toc::item(int depth, docstring const & str) /////////////////////////////////////////////////////////////////////////// TocBuilder::TocBuilder(shared_ptr toc) - : toc_(toc ? toc : make_shared()), + : toc_(toc ? toc : lyx::make_shared()), stack_() { LATTEST(toc); @@ -221,7 +221,7 @@ shared_ptr TocBuilderStore::get(string const & type, map_t::const_iterator it = map_.find(type); if (it == map_.end()) { it = map_.insert(std::make_pair(type, - make_shared(toc))).first; + lyx::make_shared(toc))).first; } return it->second; } @@ -238,7 +238,7 @@ shared_ptr TocBackend::toc(string const & type) const { // Is the type already supported? TocList::const_iterator it = tocs_.find(type); - LASSERT(it != tocs_.end(), { return make_shared(); }); + LASSERT(it != tocs_.end(), { return lyx::make_shared(); }); return it->second; } @@ -247,7 +247,7 @@ shared_ptr TocBackend::toc(string const & type) { TocList::const_iterator it = tocs_.find(type); if (it == tocs_.end()) { - it = tocs_.insert(std::make_pair(type, make_shared())).first; + it = tocs_.insert(std::make_pair(type, lyx::make_shared())).first; } return it->second; } diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp index 53475e19bb..7b4a38b223 100644 --- a/src/frontends/qt4/TocModel.cpp +++ b/src/frontends/qt4/TocModel.cpp @@ -81,7 +81,7 @@ public: TocModel::TocModel(QObject * parent) : model_(new TocTypeModel(parent)), sorted_model_(new QSortFilterProxyModel(parent)), - is_sorted_(false), toc_(make_shared()), + is_sorted_(false), toc_(lyx::make_shared()), maxdepth_(0), mindepth_(0) { sorted_model_->setSortLocaleAware(true); @@ -109,7 +109,7 @@ void TocModel::clear() { model_->blockSignals(true); model_->clear(); - toc_ = make_shared(); + toc_ = lyx::make_shared(); model_->blockSignals(false); }