anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation with MSVC in c++98 mode

Browse Source
This commit is contained in:
Guillaume Munch 2015-09-28 18:13:19 +01:00
parent afed7d06fa
commit 39343d65af
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/TocBackend.cpp
View File

@ -155,7 +155,7 @@ Toc::iterator Toc::item(int depth, docstring const & str)
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
TocBuilder::TocBuilder(shared_ptr<Toc> toc) TocBuilder::TocBuilder(shared_ptr<Toc> toc)
: toc_(toc ? toc : make_shared<Toc>()), : toc_(toc ? toc : lyx::make_shared<Toc>()),
stack_() stack_()
{ {
LATTEST(toc); LATTEST(toc);
@ -221,7 +221,7 @@ shared_ptr<TocBuilder> TocBuilderStore::get(string const & type,
map_t::const_iterator it = map_.find(type); map_t::const_iterator it = map_.find(type);
if (it == map_.end()) { if (it == map_.end()) {
it = map_.insert(std::make_pair(type, it = map_.insert(std::make_pair(type,
make_shared<TocBuilder>(toc))).first; lyx::make_shared<TocBuilder>(toc))).first;
} }
return it->second; return it->second;
} }
@ -238,7 +238,7 @@ shared_ptr<Toc const> TocBackend::toc(string const & type) const
{ {
// Is the type already supported? // Is the type already supported?
TocList::const_iterator it = tocs_.find(type); TocList::const_iterator it = tocs_.find(type);
LASSERT(it != tocs_.end(), { return make_shared<Toc>(); }); LASSERT(it != tocs_.end(), { return lyx::make_shared<Toc>(); });
return it->second; return it->second;
} }
@ -247,7 +247,7 @@ shared_ptr<Toc> TocBackend::toc(string const & type)
{ {
TocList::const_iterator it = tocs_.find(type); TocList::const_iterator it = tocs_.find(type);
if (it == tocs_.end()) { if (it == tocs_.end()) {
it = tocs_.insert(std::make_pair(type, make_shared<Toc>())).first; it = tocs_.insert(std::make_pair(type, lyx::make_shared<Toc>())).first;
} }
return it->second; return it->second;
} }

4
src/frontends/qt4/TocModel.cpp
View File

@ -81,7 +81,7 @@ public:
TocModel::TocModel(QObject * parent) TocModel::TocModel(QObject * parent)
: model_(new TocTypeModel(parent)), : model_(new TocTypeModel(parent)),
sorted_model_(new QSortFilterProxyModel(parent)), sorted_model_(new QSortFilterProxyModel(parent)),
is_sorted_(false), toc_(make_shared<Toc const>()), is_sorted_(false), toc_(lyx::make_shared<Toc const>()),
maxdepth_(0), mindepth_(0) maxdepth_(0), mindepth_(0)
{ {
sorted_model_->setSortLocaleAware(true); sorted_model_->setSortLocaleAware(true);
@ -109,7 +109,7 @@ void TocModel::clear()
{ {
model_->blockSignals(true); model_->blockSignals(true);
model_->clear(); model_->clear();
toc_ = make_shared<Toc const>(); toc_ = lyx::make_shared<Toc const>();
model_->blockSignals(false); model_->blockSignals(false);
} }