diff --git a/clutchlog/clutchlog.h b/clutchlog/clutchlog.h index 9a2c57f..eeace5a 100644 --- a/clutchlog/clutchlog.h +++ b/clutchlog/clutchlog.h @@ -32,7 +32,6 @@ #define CLUTCHLOG_HAVE_UNIX_SYSINFO 1 #else #define CLUTCHLOG_HAVE_UNIX_SYSINFO 0 - // #pragma message("[clutchlog] no POSIX SYSINFO header") #endif //! True if the system can handle the `hfill` feature. @@ -43,7 +42,6 @@ #define CLUTCHLOG_HAVE_UNIX_SYSIOCTL 1 #else #define CLUTCHLOG_HAVE_UNIX_SYSIOCTL 0 - // #pragma message("[clutchlog] no POSIX SYSIOCTL header") #endif @@ -54,12 +52,7 @@ #ifndef NDEBUG //! Actually enable clutchlog features. #define WITH_CLUTCHLOG - // #pragma message("[clutchlog] automatically enabled") - // #else - // #pragma message("[clutchlog] automatically disabled") #endif -// #else - // #pragma message("[clutchlog] manually enabled") #endif /********************************************************************** @@ -178,7 +171,6 @@ #define CLUTCHDUMP( LEVEL, CONTAINER, FILENAME ) do {/*nothing*/} while(0) #define CLUTCHFUNC( LEVEL, FUNC, ... ) do {/*nothing*/} while(0) #define CLUTCHCODE( LEVEL, CODE ) do {/*nothing*/} while(0) - // #pragma message("[clutchlog] fully disabled") #endif // WITH_CLUTCHLOG /********************************************************************** @@ -1007,9 +999,7 @@ class clutchlog #if CLUTCHLOG_HAVE_UNIX_SYSINFO == 1 //! Set the stack depth above which logs are not printed. - void depth(size_t d) { - _depth = std::min(d, std::numeric_limits::max() - _strip_calls); - } + void depth(size_t d) {_depth = d;} //! Get the stack depth above which logs are not printed. size_t depth() const {return _depth;} @@ -1343,10 +1333,7 @@ class clutchlog row = replace(row, "\\{level_short\\}", _level_short.at(stage)); #if CLUTCHLOG_HAVE_UNIX_SYSINFO == 1 - size_t actual_depth = 0; - if( _strip_calls < depth) { - actual_depth = depth - _strip_calls; - } + size_t actual_depth = depth - _strip_calls; row = replace(row, "\\{name\\}", name); row = replace(row, "\\{depth\\}", actual_depth); @@ -1371,7 +1358,6 @@ class clutchlog row = replace(row, "\\{depth_marks\\}", chevrons.str()); } #endif - row = replace(row, "\\{level_fmt\\}", _level_fmt.at(stage).str()); row = replace(row, "\\{filehash_fmt\\}", fmt::hash(file, _filehash_fmts).str() ); row = replace(row, "\\{funchash_fmt\\}", fmt::hash(func, _funchash_fmts).str() );