Fix preprocessor error.

##__VA_ARGS__ causes an error with clang if it's not preceded by a comma. The ## is wholly unnecessary in this case so it can just be removed. Bug b/73656151 Change-Id: Icc8a67a91b270d0e9b006cae7a438cdefa412f87 Reviewed-on: https://swiftshader-review.googlesource.com/21208Tested-by: Nicolas Capens <nicolascapens@google.com> Reviewed-by: Corentin Wallez <cwallez@google.com>

Fix preprocessor error.
60be5c45 · Nicolas Capens · Nicolas Capens · 720aec1c · 60be5c45 · 60be5c45
Commit 60be5c45 authored Oct 02, 2018 by Nicolas Capens Committed by Nicolas Capens Oct 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Debug.hpp src/Common/Debug.hpp +1 -1

debug.h src/OpenGL/common/debug.h +1 -1

debug.h src/OpenGL/compiler/debug.h +1 -1

VkDebug.hpp src/Vulkan/VkDebug.hpp +1 -1

No files found.
--- a/src/Common/Debug.hpp
+++ b/src/Common/Debug.hpp
@@ -40,7 +40,7 @@ inline void trace() {}
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 	#define UNIMPLEMENTED(...) do { \
 		sw::trace("\t! Unimplemented: %s(%d): ", __FUNCTION__, __LINE__); \
-		sw::trace(##__VA_ARGS__); \
+		sw::trace(__VA_ARGS__); \
 		sw::trace("\n"); \
 		ASSERT(false); \
 	} while(0)

--- a/src/OpenGL/common/debug.h
+++ b/src/OpenGL/common/debug.h
@@ -72,7 +72,7 @@ inline void trace() {}
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 #define UNIMPLEMENTED(...) do { \
 	es::trace("\t! Unimplemented: %s(%d): ", __FUNCTION__, __LINE__); \
-	es::trace(##__VA_ARGS__); \
+	es::trace(__VA_ARGS__); \
 	es::trace("\n"); \
 	assert(false); \
 	} while(0)

--- a/src/OpenGL/compiler/debug.h
+++ b/src/OpenGL/compiler/debug.h
@@ -50,7 +50,7 @@ inline void Trace() {}
 #undef UNIMPLEMENTED
 #define UNIMPLEMENTED(...) do { \
 	sh::Trace("Unimplemented invoked: %s(%d): ", __FUNCTION__, __LINE__); \
-	sh::Trace(##__VA_ARGS__); \
+	sh::Trace(__VA_ARGS__); \
 	sh::Trace("\n"); \
 	assert(false); \
 } while(0)

--- a/src/Vulkan/VkDebug.hpp
+++ b/src/Vulkan/VkDebug.hpp
@@ -69,7 +69,7 @@ inline void trace() {}
 #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON)
 #define UNIMPLEMENTED(...) do { \
 	vk::trace("\t! Unimplemented: %s(%d): ", __FUNCTION__, __LINE__); \
-	vk::trace(##__VA_ARGS__); \
+	vk::trace(__VA_ARGS__); \
 	vk::trace("\n"); \
 	assert(false); \
 	} while(0)