diff options
Diffstat (limited to 'src/mongo/db/fts')
-rw-r--r-- | src/mongo/db/fts/fts_basic_tokenizer.cpp | 5 | ||||
-rw-r--r-- | src/mongo/db/fts/fts_language.cpp | 6 | ||||
-rw-r--r-- | src/mongo/db/fts/fts_query_impl.cpp | 5 | ||||
-rw-r--r-- | src/mongo/db/fts/fts_query_noop.cpp | 5 | ||||
-rw-r--r-- | src/mongo/db/fts/fts_unicode_tokenizer.cpp | 3 |
5 files changed, 14 insertions, 10 deletions
diff --git a/src/mongo/db/fts/fts_basic_tokenizer.cpp b/src/mongo/db/fts/fts_basic_tokenizer.cpp index a7dab749790..25b8c0afad1 100644 --- a/src/mongo/db/fts/fts_basic_tokenizer.cpp +++ b/src/mongo/db/fts/fts_basic_tokenizer.cpp @@ -31,12 +31,13 @@ #include "mongo/db/fts/fts_basic_tokenizer.h" +#include <memory> + #include "mongo/db/fts/fts_query_impl.h" #include "mongo/db/fts/fts_spec.h" #include "mongo/db/fts/stemmer.h" #include "mongo/db/fts/stop_words.h" #include "mongo/db/fts/tokenizer.h" -#include "mongo/stdx/memory.h" #include "mongo/util/str.h" namespace mongo { @@ -50,7 +51,7 @@ BasicFTSTokenizer::BasicFTSTokenizer(const FTSLanguage* language) void BasicFTSTokenizer::reset(StringData document, Options options) { _options = options; _document = document.toString(); - _tokenizer = stdx::make_unique<Tokenizer>(_language, _document); + _tokenizer = std::make_unique<Tokenizer>(_language, _document); } bool BasicFTSTokenizer::moveNext() { diff --git a/src/mongo/db/fts/fts_language.cpp b/src/mongo/db/fts/fts_language.cpp index faa54e79333..7d1fdd160de 100644 --- a/src/mongo/db/fts/fts_language.cpp +++ b/src/mongo/db/fts/fts_language.cpp @@ -29,6 +29,7 @@ #include "mongo/db/fts/fts_language.h" +#include <memory> #include <string> #include "mongo/base/init.h" @@ -36,7 +37,6 @@ #include "mongo/db/fts/fts_basic_tokenizer.h" #include "mongo/db/fts/fts_unicode_phrase_matcher.h" #include "mongo/db/fts/fts_unicode_tokenizer.h" -#include "mongo/stdx/memory.h" #include "mongo/util/assert_util.h" #include "mongo/util/str.h" #include "mongo/util/string_map.h" @@ -298,7 +298,7 @@ StatusWithFTSLanguage FTSLanguage::make(StringData langName, TextIndexVersion te } std::unique_ptr<FTSTokenizer> BasicFTSLanguage::createTokenizer() const { - return stdx::make_unique<BasicFTSTokenizer>(this); + return std::make_unique<BasicFTSTokenizer>(this); } const FTSPhraseMatcher& BasicFTSLanguage::getPhraseMatcher() const { @@ -306,7 +306,7 @@ const FTSPhraseMatcher& BasicFTSLanguage::getPhraseMatcher() const { } std::unique_ptr<FTSTokenizer> UnicodeFTSLanguage::createTokenizer() const { - return stdx::make_unique<UnicodeFTSTokenizer>(this); + return std::make_unique<UnicodeFTSTokenizer>(this); } const FTSPhraseMatcher& UnicodeFTSLanguage::getPhraseMatcher() const { diff --git a/src/mongo/db/fts/fts_query_impl.cpp b/src/mongo/db/fts/fts_query_impl.cpp index fffc4362fbb..c9f7e151b9d 100644 --- a/src/mongo/db/fts/fts_query_impl.cpp +++ b/src/mongo/db/fts/fts_query_impl.cpp @@ -31,10 +31,11 @@ #include "mongo/db/fts/fts_query_impl.h" +#include <memory> + #include "mongo/db/fts/fts_query_parser.h" #include "mongo/db/fts/fts_spec.h" #include "mongo/db/fts/fts_tokenizer.h" -#include "mongo/stdx/memory.h" #include "mongo/util/str.h" namespace mongo { @@ -136,7 +137,7 @@ Status FTSQueryImpl::parse(TextIndexVersion textIndexVersion) { } std::unique_ptr<FTSQuery> FTSQueryImpl::clone() const { - auto clonedQuery = stdx::make_unique<FTSQueryImpl>(); + auto clonedQuery = std::make_unique<FTSQueryImpl>(); clonedQuery->setQuery(getQuery()); clonedQuery->setLanguage(getLanguage()); clonedQuery->setCaseSensitive(getCaseSensitive()); diff --git a/src/mongo/db/fts/fts_query_noop.cpp b/src/mongo/db/fts/fts_query_noop.cpp index aa32a10d011..c11fdecdab0 100644 --- a/src/mongo/db/fts/fts_query_noop.cpp +++ b/src/mongo/db/fts/fts_query_noop.cpp @@ -31,13 +31,14 @@ #include "mongo/db/fts/fts_query_noop.h" -#include "mongo/stdx/memory.h" +#include <memory> + namespace mongo { namespace fts { std::unique_ptr<FTSQuery> FTSQueryNoop::clone() const { - auto clonedQuery = stdx::make_unique<FTSQueryNoop>(); + auto clonedQuery = std::make_unique<FTSQueryNoop>(); clonedQuery->setQuery(getQuery()); clonedQuery->setLanguage(getLanguage()); clonedQuery->setCaseSensitive(getCaseSensitive()); diff --git a/src/mongo/db/fts/fts_unicode_tokenizer.cpp b/src/mongo/db/fts/fts_unicode_tokenizer.cpp index ab27d3a5c6a..5254e063c83 100644 --- a/src/mongo/db/fts/fts_unicode_tokenizer.cpp +++ b/src/mongo/db/fts/fts_unicode_tokenizer.cpp @@ -31,12 +31,13 @@ #include "mongo/db/fts/fts_unicode_tokenizer.h" +#include <memory> + #include "mongo/db/fts/fts_query_impl.h" #include "mongo/db/fts/fts_spec.h" #include "mongo/db/fts/stemmer.h" #include "mongo/db/fts/stop_words.h" #include "mongo/db/fts/tokenizer.h" -#include "mongo/stdx/memory.h" #include "mongo/util/str.h" namespace mongo { |