Renamed InfoLogLevel::DEBUG to InfoLogLevel::DEBUG_LEVEL

Summary: XCode for some reason injects `#define DEBUG 1` into our code, which makes compile fail because we use `DEBUG` keyword for other stuff. This diff fixes the issue by renaming `DEBUG` to `DEBUG_LEVEL`.

Test Plan: compiles

Reviewers: dhruba, haobo, sdong, yhchiang, ljin

Reviewed By: yhchiang

CC: leveldb

Differential Revision: https://reviews.facebook.net/D17709
This commit is contained in:
Igor Canadi
2014-04-10 15:27:42 -07:00
parent 75b59d5146
commit ddef6841b3
9 changed files with 41 additions and 36 deletions

View File

@@ -535,11 +535,11 @@ class Directory {
};
enum InfoLogLevel : unsigned char {
DEBUG = 0,
INFO,
WARN,
ERROR,
FATAL,
DEBUG_LEVEL = 0,
INFO_LEVEL,
WARN_LEVEL,
ERROR_LEVEL,
FATAL_LEVEL,
NUM_INFO_LOG_LEVELS,
};
@@ -547,7 +547,7 @@ enum InfoLogLevel : unsigned char {
class Logger {
public:
enum { DO_NOT_SUPPORT_GET_LOG_FILE_SIZE = -1 };
explicit Logger(const InfoLogLevel log_level = InfoLogLevel::INFO)
explicit Logger(const InfoLogLevel log_level = InfoLogLevel::INFO_LEVEL)
: log_level_(log_level) {}
virtual ~Logger();
@@ -565,7 +565,7 @@ class Logger {
return;
}
if (log_level == INFO) {
if (log_level == InfoLogLevel::INFO_LEVEL) {
// Doesn't print log level if it is INFO level.
// This is to avoid unexpected performance regression after we add
// the feature of log level. All the logs before we add the feature