diff options
author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-02-21 15:58:47 +0100 |
---|---|---|
committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-03-11 15:41:50 +0100 |
commit | 49e45d532f80c6ffc60c2fbd754030a11dfc8893 (patch) | |
tree | 2a9bff47e6ce0ed7e71330ba3678bc8cafc98685 | |
parent | 29fc4839b7aaf76c3587cf0d268546fd1d1390c4 (diff) | |
download | libnitrokey-49e45d532f80c6ffc60c2fbd754030a11dfc8893.tar.gz libnitrokey-49e45d532f80c6ffc60c2fbd754030a11dfc8893.tar.bz2 |
Use nullptr instead of NULL
Signed-off-by: Szczepan Zalega <szczepan@nitrokey.com>
-rw-r--r-- | include/log.h | 2 | ||||
-rw-r--r-- | log.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/log.h b/include/log.h index a3e8281..7c25918 100644 --- a/include/log.h +++ b/include/log.h @@ -34,7 +34,7 @@ class Log { Log() : mp_loghandler(&stdlog_handler), m_loglevel(Loglevel::WARNING) {} static Log &instance() { - if (mp_instance == NULL) mp_instance = new Log; + if (mp_instance == nullptr) mp_instance = new Log; return *mp_instance; } @@ -7,7 +7,7 @@ namespace nitrokey { namespace log { -Log *Log::mp_instance = NULL; +Log *Log::mp_instance = nullptr; StdlogHandler stdlog_handler; std::string LogHandler::loglevel_to_str(Loglevel lvl) { @@ -27,7 +27,7 @@ std::string LogHandler::loglevel_to_str(Loglevel lvl) { } void Log::operator()(const std::string &logstr, Loglevel lvl) { - if (mp_loghandler != NULL) + if (mp_loghandler != nullptr) if ((int)(lvl) >= (int)(m_loglevel)) mp_loghandler->print(logstr, lvl); } |