diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-07 13:40:04 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-07 13:40:04 -0500 |
| commit | 2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch) | |
| tree | 4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/log_manager.cpp | |
| parent | f06922268a369c2b76ac2652c58516f915b71606 (diff) | |
| parent | 8a624239703c046d89ebeaf3ea13c87af75b550f (diff) | |
Merge pull request #245 from rohit-n/null-nullptr
Change NULLs to nullptrs.
Diffstat (limited to 'src/common/log_manager.cpp')
| -rw-r--r-- | src/common/log_manager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp index 2ef7d98c0b..39b1924c7a 100644 --- a/src/common/log_manager.cpp +++ b/src/common/log_manager.cpp @@ -21,7 +21,7 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type, const char* va_end(args); } -LogManager *LogManager::m_logManager = NULL; +LogManager *LogManager::m_logManager = nullptr; LogManager::LogManager() { @@ -141,7 +141,7 @@ void LogManager::Init() void LogManager::Shutdown() { delete m_logManager; - m_logManager = NULL; + m_logManager = nullptr; } LogContainer::LogContainer(const char* shortName, const char* fullName, bool enable) |