diff options
author | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2019-06-14 16:42:10 -0400 |
---|---|---|
committer | A. Jesse Jiryu Davis <jesse@mongodb.com> | 2019-06-14 19:23:18 -0400 |
commit | 47b380f03e8898f4706ff01fa2be64dfb72e0dba (patch) | |
tree | fb3508758c9abd0e297afee43ac847bf5aebcbbb /src/mongo/logger | |
parent | b3c26131f6ab3f919beca658341e737de5d45683 (diff) | |
download | mongo-47b380f03e8898f4706ff01fa2be64dfb72e0dba.tar.gz |
SERVER-41071 Replace NULL and 0 with nullptr
Diffstat (limited to 'src/mongo/logger')
-rw-r--r-- | src/mongo/logger/ramlog.cpp | 14 | ||||
-rw-r--r-- | src/mongo/logger/rotatable_file_manager.cpp | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/logger/ramlog.cpp b/src/mongo/logger/ramlog.cpp index a1f32e26726..a2bf4bffd15 100644 --- a/src/mongo/logger/ramlog.cpp +++ b/src/mongo/logger/ramlog.cpp @@ -43,8 +43,8 @@ using std::string; namespace { typedef std::map<string, RamLog*> RM; -stdx::mutex* _namedLock = NULL; -RM* _named = NULL; +stdx::mutex* _namedLock = nullptr; +RM* _named = nullptr; } // namespace @@ -58,7 +58,7 @@ RamLog::~RamLog() {} void RamLog::write(const std::string& str) { stdx::lock_guard<stdx::mutex> lk(_mutex); - _lastWrite = time(0); + _lastWrite = time(nullptr); _totalLinesWritten++; char* p = lines[(h + n) % N]; @@ -136,7 +136,7 @@ string RamLog::clean(const std::vector<const char*>& v, int i, string line) { string RamLog::linkify(const char* s) { const char* p = s; const char* h = strstr(p, "http://"); - if (h == 0) + if (h == nullptr) return s; const char* sp = h + 7; @@ -179,7 +179,7 @@ RamLog* RamLog::get(const std::string& name) { _named = new RM(); } - RamLog* result = mapFindWithDefault(*_named, name, static_cast<RamLog*>(NULL)); + RamLog* result = mapFindWithDefault(*_named, name, static_cast<RamLog*>(nullptr)); if (!result) { result = new RamLog(name); (*_named)[name] = result; @@ -189,9 +189,9 @@ RamLog* RamLog::get(const std::string& name) { RamLog* RamLog::getIfExists(const std::string& name) { if (!_named) - return NULL; + return nullptr; stdx::lock_guard<stdx::mutex> lk(*_namedLock); - return mapFindWithDefault(*_named, name, static_cast<RamLog*>(NULL)); + return mapFindWithDefault(*_named, name, static_cast<RamLog*>(nullptr)); } void RamLog::getNames(std::vector<string>& names) { diff --git a/src/mongo/logger/rotatable_file_manager.cpp b/src/mongo/logger/rotatable_file_manager.cpp index f5eb9ebe73f..4ba06af6f5c 100644 --- a/src/mongo/logger/rotatable_file_manager.cpp +++ b/src/mongo/logger/rotatable_file_manager.cpp @@ -61,7 +61,7 @@ StatusWithRotatableFileWriter RotatableFileManager::openFile(const std::string& } RotatableFileWriter* RotatableFileManager::getFile(const std::string& name) { - return mapFindWithDefault(_writers, name, static_cast<RotatableFileWriter*>(NULL)); + return mapFindWithDefault(_writers, name, static_cast<RotatableFileWriter*>(nullptr)); } RotatableFileManager::FileNameStatusPairVector RotatableFileManager::rotateAll( |