summaryrefslogtreecommitdiff
path: root/log.cc
diff options
context:
space:
mode:
authorSzczepan Zalega <szczepan@nitrokey.com>2017-03-11 17:18:59 +0100
committerSzczepan Zalega <szczepan@nitrokey.com>2017-03-11 17:18:59 +0100
commit22d05ce647281056d71fbd3c31df3bcd6396188d (patch)
tree90208930f54c47987bfd5ffcf0a0acaaad2510da /log.cc
parented5044da43172d86a1aa475473561a4818b7c69c (diff)
parentac6b9c18ef55f4cd36e85069cf0cf82c14e04404 (diff)
downloadlibnitrokey-22d05ce647281056d71fbd3c31df3bcd6396188d.tar.gz
libnitrokey-22d05ce647281056d71fbd3c31df3bcd6396188d.tar.bz2
Merge branch 'libnitrokey_3'
Diffstat (limited to 'log.cc')
-rw-r--r--log.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/log.cc b/log.cc
index 5889a1e..70853fc 100644
--- a/log.cc
+++ b/log.cc
@@ -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);
}