diff options
| author | 2014-12-07 13:40:04 -0500 | |
|---|---|---|
| committer | 2014-12-07 13:40:04 -0500 | |
| commit | 2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch) | |
| tree | 4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/log_manager.cpp | |
| parent | Merge pull request #252 from yuriks/patch-1 (diff) | |
| parent | Change NULLs to nullptrs. (diff) | |
| download | yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.gz yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.xz yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.zip | |
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 2ef7d98c0..39b1924c7 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* | |||
| 21 | va_end(args); | 21 | va_end(args); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | LogManager *LogManager::m_logManager = NULL; | 24 | LogManager *LogManager::m_logManager = nullptr; |
| 25 | 25 | ||
| 26 | LogManager::LogManager() | 26 | LogManager::LogManager() |
| 27 | { | 27 | { |
| @@ -141,7 +141,7 @@ void LogManager::Init() | |||
| 141 | void LogManager::Shutdown() | 141 | void LogManager::Shutdown() |
| 142 | { | 142 | { |
| 143 | delete m_logManager; | 143 | delete m_logManager; |
| 144 | m_logManager = NULL; | 144 | m_logManager = nullptr; |
| 145 | } | 145 | } |
| 146 | 146 | ||
| 147 | LogContainer::LogContainer(const char* shortName, const char* fullName, bool enable) | 147 | LogContainer::LogContainer(const char* shortName, const char* fullName, bool enable) |