commit 196d81774ef86d1c6c2d028dd5407b47eaa51a99
author Ben Clayton <bclayton@google.com> Mon Feb 10 21:42:18 2020 +0000
committer Ben Clayton <bclayton@google.com> Mon Feb 10 22:38:08 2020 +0000
tree 198fead64d0238055ba6111be27b763dbd2d4ccf
parent b3b2a4fc756f8f6dca980c75d785e06134b9d5f8

Debug: Rename levels.

`DEBUG` has been defined by some projects as a preprocessor macro.
Rename to fix builds.

Fixes: b/149238449
Change-Id: I9a77321504c7097a5c59dde8b918b52650a90c0f
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/41050
Reviewed-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>
Tested-by: Ben Clayton <bclayton@google.com>

src/Reactor/Debug.cpp

diff --git a/src/Reactor/Debug.cpp b/src/Reactor/Debug.cpp
index 5b10036..2df3e28 100644
--- a/src/Reactor/Debug.cpp
+++ b/src/Reactor/Debug.cpp
@@ -39,7 +39,7 @@
 #endif
 
 #ifndef REACTOR_LOGGING_LEVEL
-#	define REACTOR_LOGGING_LEVEL INFO
+#	define REACTOR_LOGGING_LEVEL Info
 #endif
 
 namespace {
@@ -98,11 +98,11 @@
 
 enum class Level
 {
-	DEBUG,
-	INFO,
-	WARN,
-	ERROR,
-	FATAL,
+	Debug,
+	Info,
+	Warn,
+	Error,
+	Fatal,
 };
 
 #ifdef __ANDROID__
@@ -110,19 +110,19 @@
 {
 	switch(level)
 	{
-		case Level::DEBUG:
+		case Level::Debug:
 			__android_log_write(ANDROID_LOG_DEBUG, "SwiftShader", msg);
 			break;
-		case Level::INFO:
+		case Level::Info:
 			__android_log_write(ANDROID_LOG_INFO, "SwiftShader", msg);
 			break;
-		case Level::WARN:
+		case Level::Warn:
 			__android_log_write(ANDROID_LOG_WARN, "SwiftShader", msg);
 			break;
-		case Level::ERROR:
+		case Level::Error:
 			__android_log_write(ANDROID_LOG_ERROR, "SwiftShader", msg);
 			break;
-		case Level::FATAL:
+		case Level::Fatal:
 			__android_log_write(ANDROID_LOG_FATAL, "SwiftShader", msg);
 			break;
 	}
@@ -132,13 +132,13 @@
 {
 	switch(level)
 	{
-		case Level::DEBUG:
-		case Level::INFO:
+		case Level::Debug:
+		case Level::Info:
 			fprintf(stdout, "%s", msg);
 			break;
-		case Level::WARN:
-		case Level::ERROR:
-		case Level::FATAL:
+		case Level::Warn:
+		case Level::Error:
+		case Level::Fatal:
 			fprintf(stderr, "%s", msg);
 			break;
 	}
@@ -187,7 +187,7 @@
 {
 	va_list vararg;
 	va_start(vararg, format);
-	logv(Level::DEBUG, format, vararg);
+	logv(Level::Debug, format, vararg);
 	va_end(vararg);
 }
 
@@ -195,7 +195,7 @@
 {
 	va_list vararg;
 	va_start(vararg, format);
-	logv(Level::WARN, format, vararg);
+	logv(Level::Warn, format, vararg);
 	va_end(vararg);
 }
 
@@ -204,7 +204,7 @@
 	va_list vararg;
 
 	va_start(vararg, format);
-	logv(Level::FATAL, format, vararg);
+	logv(Level::Fatal, format, vararg);
 	va_end(vararg);
 
 	::abort();
@@ -218,7 +218,7 @@
 		// Abort after tracing and printing to stderr
 		va_list vararg;
 		va_start(vararg, format);
-		logv(Level::FATAL, format, vararg);
+		logv(Level::Fatal, format, vararg);
 		va_end(vararg);
 
 		::abort();
@@ -227,7 +227,7 @@
 	{
 		va_list vararg;
 		va_start(vararg, format);
-		logv(Level::FATAL, format, vararg);
+		logv(Level::Fatal, format, vararg);
 		va_end(vararg);
 	}
 }

src/System/Debug.cpp

diff --git a/src/System/Debug.cpp b/src/System/Debug.cpp
index f386156..8be91a1 100644
--- a/src/System/Debug.cpp
+++ b/src/System/Debug.cpp
@@ -39,7 +39,7 @@
 #endif
 
 #ifndef SWIFTSHADER_LOGGING_LEVEL
-#	define SWIFTSHADER_LOGGING_LEVEL INFO
+#	define SWIFTSHADER_LOGGING_LEVEL Info
 #endif
 
 namespace {
@@ -98,11 +98,11 @@
 
 enum class Level
 {
-	DEBUG,
-	INFO,
-	WARN,
-	ERROR,
-	FATAL,
+	Debug,
+	Info,
+	Warn,
+	Error,
+	Fatal,
 };
 
 #ifdef __ANDROID__
@@ -110,19 +110,19 @@
 {
 	switch(level)
 	{
-		case Level::DEBUG:
+		case Level::Debug:
 			__android_log_write(ANDROID_LOG_DEBUG, "SwiftShader", msg);
 			break;
-		case Level::INFO:
+		case Level::Info:
 			__android_log_write(ANDROID_LOG_INFO, "SwiftShader", msg);
 			break;
-		case Level::WARN:
+		case Level::Warn:
 			__android_log_write(ANDROID_LOG_WARN, "SwiftShader", msg);
 			break;
-		case Level::ERROR:
+		case Level::Error:
 			__android_log_write(ANDROID_LOG_ERROR, "SwiftShader", msg);
 			break;
-		case Level::FATAL:
+		case Level::Fatal:
 			__android_log_write(ANDROID_LOG_FATAL, "SwiftShader", msg);
 			break;
 	}
@@ -132,13 +132,13 @@
 {
 	switch(level)
 	{
-		case Level::DEBUG:
-		case Level::INFO:
+		case Level::Debug:
+		case Level::Info:
 			fprintf(stdout, "%s", msg);
 			break;
-		case Level::WARN:
-		case Level::ERROR:
-		case Level::FATAL:
+		case Level::Warn:
+		case Level::Error:
+		case Level::Fatal:
 			fprintf(stderr, "%s", msg);
 			break;
 	}
@@ -187,7 +187,7 @@
 {
 	va_list vararg;
 	va_start(vararg, format);
-	logv(Level::DEBUG, format, vararg);
+	logv(Level::Debug, format, vararg);
 	va_end(vararg);
 }
 
@@ -195,7 +195,7 @@
 {
 	va_list vararg;
 	va_start(vararg, format);
-	logv(Level::WARN, format, vararg);
+	logv(Level::Warn, format, vararg);
 	va_end(vararg);
 }
 
@@ -204,7 +204,7 @@
 	va_list vararg;
 
 	va_start(vararg, format);
-	logv(Level::FATAL, format, vararg);
+	logv(Level::Fatal, format, vararg);
 	va_end(vararg);
 
 	::abort();
@@ -218,7 +218,7 @@
 		// Abort after tracing and printing to stderr
 		va_list vararg;
 		va_start(vararg, format);
-		logv(Level::FATAL, format, vararg);
+		logv(Level::Fatal, format, vararg);
 		va_end(vararg);
 
 		::abort();
@@ -227,7 +227,7 @@
 	{
 		va_list vararg;
 		va_start(vararg, format);
-		logv(Level::FATAL, format, vararg);
+		logv(Level::Fatal, format, vararg);
 		va_end(vararg);
 	}
 }