summaryrefslogtreecommitdiff
path: root/src/mongo/db/fts
diff options
context:
space:
mode:
authorA. Jesse Jiryu Davis <jesse@mongodb.com>2019-06-14 16:42:10 -0400
committerA. Jesse Jiryu Davis <jesse@mongodb.com>2019-06-14 19:23:18 -0400
commit47b380f03e8898f4706ff01fa2be64dfb72e0dba (patch)
treefb3508758c9abd0e297afee43ac847bf5aebcbbb /src/mongo/db/fts
parentb3c26131f6ab3f919beca658341e737de5d45683 (diff)
downloadmongo-47b380f03e8898f4706ff01fa2be64dfb72e0dba.tar.gz
SERVER-41071 Replace NULL and 0 with nullptr
Diffstat (limited to 'src/mongo/db/fts')
-rw-r--r--src/mongo/db/fts/fts_basic_phrase_matcher.cpp2
-rw-r--r--src/mongo/db/fts/fts_element_iterator.h2
-rw-r--r--src/mongo/db/fts/stemmer.cpp6
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/db/fts/fts_basic_phrase_matcher.cpp b/src/mongo/db/fts/fts_basic_phrase_matcher.cpp
index 320127c87dc..8b4c373e048 100644
--- a/src/mongo/db/fts/fts_basic_phrase_matcher.cpp
+++ b/src/mongo/db/fts/fts_basic_phrase_matcher.cpp
@@ -43,7 +43,7 @@ bool BasicFTSPhraseMatcher::phraseMatches(const string& phrase,
return haystack.find(phrase) != string::npos;
}
- return strcasestr(haystack.c_str(), phrase.c_str()) != NULL;
+ return strcasestr(haystack.c_str(), phrase.c_str()) != nullptr;
}
} // namespace fts
diff --git a/src/mongo/db/fts/fts_element_iterator.h b/src/mongo/db/fts/fts_element_iterator.h
index db0426de41a..611cf33c7fb 100644
--- a/src/mongo/db/fts/fts_element_iterator.h
+++ b/src/mongo/db/fts/fts_element_iterator.h
@@ -48,7 +48,7 @@ struct FTSIteratorValue {
FTSIteratorValue(const char* text, const FTSLanguage* language, double weight)
: _text(text), _language(language), _weight(weight), _valid(true) {}
- FTSIteratorValue() : _text(NULL), _language(), _weight(0.0), _valid(false) {}
+ FTSIteratorValue() : _text(nullptr), _language(), _weight(0.0), _valid(false) {}
bool valid() const {
return _valid;
diff --git a/src/mongo/db/fts/stemmer.cpp b/src/mongo/db/fts/stemmer.cpp
index db5e97227da..5b9fcdadc3c 100644
--- a/src/mongo/db/fts/stemmer.cpp
+++ b/src/mongo/db/fts/stemmer.cpp
@@ -37,7 +37,7 @@ namespace mongo {
namespace fts {
Stemmer::Stemmer(const FTSLanguage* language) {
- _stemmer = NULL;
+ _stemmer = nullptr;
if (language->str() != "none")
_stemmer = sb_stemmer_new(language->str().c_str(), "UTF_8");
}
@@ -45,7 +45,7 @@ Stemmer::Stemmer(const FTSLanguage* language) {
Stemmer::~Stemmer() {
if (_stemmer) {
sb_stemmer_delete(_stemmer);
- _stemmer = NULL;
+ _stemmer = nullptr;
}
}
@@ -56,7 +56,7 @@ StringData Stemmer::stem(StringData word) const {
const sb_symbol* sb_sym =
sb_stemmer_stem(_stemmer, (const sb_symbol*)word.rawData(), word.size());
- if (sb_sym == NULL) {
+ if (sb_sym == nullptr) {
// out of memory
MONGO_UNREACHABLE;
}