X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTocBackend.cpp;h=e8c430d8eb6639acbccc8cbfb161d06d46d83376;hb=b032e2dfafbf1e86918dd0cd66e5de602edeee00;hp=6526c57537ae53acadfef5079c6e5a31a1dd82e4;hpb=ca8709aaf5f5f14aae1978403e13aac3a93506aa;p=features.git

diff --git a/src/TocBackend.cpp b/src/TocBackend.cpp
index 6526c57537..e8c430d8eb 100644
--- a/src/TocBackend.cpp
+++ b/src/TocBackend.cpp
@@ -153,7 +153,7 @@ Toc::iterator TocBackend::findItem(Toc & toc, int depth, docstring const & str)
 ///////////////////////////////////////////////////////////////////////////
 
 TocBuilder::TocBuilder(shared_ptr<Toc> toc)
-	: toc_(toc ? toc : lyx::make_shared<Toc>()),
+	: toc_(toc ? toc : make_shared<Toc>()),
 	  stack_()
 {
 	LATTEST(toc);
@@ -214,13 +214,11 @@ void TocBuilder::pop()
 ///////////////////////////////////////////////////////////////////////////
 
 shared_ptr<TocBuilder> TocBuilderStore::get(string const & type,
-											shared_ptr<Toc> toc)
+                                            shared_ptr<Toc> toc)
 {
 	map_t::const_iterator it = map_.find(type);
-	if (it == map_.end()) {
-		it = map_.insert(std::make_pair(type,
-									lyx::make_shared<TocBuilder>(toc))).first;
-	}
+	if (it == map_.end())
+		it = map_.insert(make_pair(type, make_shared<TocBuilder>(toc))).first;
 	return it->second;
 }
 
@@ -236,7 +234,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 lyx::make_shared<Toc>(); });
+	LASSERT(it != tocs_.end(), { return make_shared<Toc>(); });
 	return it->second;
 }
 
@@ -244,9 +242,8 @@ shared_ptr<Toc const> TocBackend::toc(string const & type) const
 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, lyx::make_shared<Toc>())).first;
-	}
+	if (it == tocs_.end())
+		it = tocs_.insert(make_pair(type, make_shared<Toc>())).first;
 	return it->second;
 }
 
@@ -357,7 +354,7 @@ void TocBackend::writePlaintextTocList(string const & type,
 }
 
 
-docstring TocBackend::outlinerName(std::string const & type) const
+docstring TocBackend::outlinerName(string const & type) const
 {
 	return translateIfPossible(
 	    buffer_->params().documentClass().outlinerName(type));