tami/MYNT-EYE-S-SDK
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(miniglog): remove log_severity_global

Browse Source
This commit is contained in:
John Zhao 2019-01-16 10:38:46 +08:00
parent a8796478e6
commit 5105b5ea82
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mynteye/logger.h
View File

@ -86,6 +86,7 @@ struct glog_init {
#else #else
#define MYNTEYE_MAX_LOG_LEVEL google::INFO #define MYNTEYE_MAX_LOG_LEVEL google::INFO
// #define MYNTEYE_MAX_LOG_LEVEL 2
#include "mynteye/miniglog.h" #include "mynteye/miniglog.h"

6
include/mynteye/miniglog.h
View File

@ -157,9 +157,6 @@ class MYNTEYE_API LogSink {
// Global set of log sinks. The actual object is defined in logging.cc. // Global set of log sinks. The actual object is defined in logging.cc.
MYNTEYE_API extern std::set<LogSink *> log_sinks_global; MYNTEYE_API extern std::set<LogSink *> log_sinks_global;
// Added by chachi - a runtime global maximum log level. Defined in logging.cc
MYNTEYE_API extern int log_severity_global;
inline void InitGoogleLogging(char */*argv*/) { inline void InitGoogleLogging(char */*argv*/) {
// Do nothing; this is ignored. // Do nothing; this is ignored.
} }
@ -315,8 +312,7 @@ class MYNTEYE_API LoggerVoidify {
// Log only if condition is met. Otherwise evaluates to void. // Log only if condition is met. Otherwise evaluates to void.
#define LOG_IF(severity, condition) \ #define LOG_IF(severity, condition) \
(static_cast<int>(severity) > google::log_severity_global || !(condition)) ? \ !(condition) ? (void) 0 : LoggerVoidify() & \
(void) 0 : LoggerVoidify() & \
MessageLogger((char *)__FILE__, __LINE__, "native", severity).stream() MessageLogger((char *)__FILE__, __LINE__, "native", severity).stream()
// Log only if condition is NOT met. Otherwise evaluates to void. // Log only if condition is NOT met. Otherwise evaluates to void.

2
src/mynteye/miniglog.cc
View File

@ -36,6 +36,4 @@ namespace google {
// that there is only one instance of this across the entire program. // that there is only one instance of this across the entire program.
std::set<google::LogSink *> log_sinks_global; std::set<google::LogSink *> log_sinks_global;
int log_severity_global(INFO);
} // namespace google } // namespace google