Fix compilation with MSVC in c++98 mode

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index f0750c61bda9ac16a2a84a73ce3158ebf5b366d9..f3511be8e582ae18f11bd0867435e1f2f2c5ff06 100644 (file)
--- 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 ? toc : make_shared<Toc>()),
+       : toc_(toc ? toc : lyx::make_shared<Toc>()),
          stack_()
 {
        LATTEST(toc);
@@ -221,7 +221,7 @@ shared_ptr<TocBuilder> 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<TocBuilder>(toc))).first;
+                                                                       lyx::make_shared<TocBuilder>(toc))).first;
        }
        return it->second;
 }
@@ -238,7 +238,7 @@ shared_ptr<Toc const> 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<Toc>(); });
+       LASSERT(it != tocs_.end(), { return lyx::make_shared<Toc>(); });
        return it->second;
 }
 
@@ -247,7 +247,7 @@ shared_ptr<Toc> 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<Toc>())).first;
+               it = tocs_.insert(std::make_pair(type, lyx::make_shared<Toc>())).first;
        }
        return it->second;
 }

diff --git a/src/frontends/qt4/TocModel.cpp b/src/frontends/qt4/TocModel.cpp
index 53475e19bb446aaf820c0c79411b51932ecf0159..7b4a38b223bf6022d671a24c99fffd5f7f020102 100644 (file)
--- 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<Toc const>()),
+         is_sorted_(false), toc_(lyx::make_shared<Toc const>()),
          maxdepth_(0), mindepth_(0)
 {
        sorted_model_->setSortLocaleAware(true);
@@ -109,7 +109,7 @@ void TocModel::clear()
 {
        model_->blockSignals(true);
        model_->clear();
-       toc_ = make_shared<Toc const>();
+       toc_ = lyx::make_shared<Toc const>();
        model_->blockSignals(false);
 }