From 5471bf0e8ae420b2199e22ed8d472453b710c871 Mon Sep 17 00:00:00 2001
From: Kim Barrett <kbarrett@openjdk.org>
Date: Tue, 3 Mar 2015 19:47:49 -0500
Subject: [PATCH] 8073994: STATIC_ASSERT use of __LINE__ is wrong

Reviewed-by: dholmes, ehelin
---
 hotspot/src/share/vm/utilities/debug.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hotspot/src/share/vm/utilities/debug.hpp b/hotspot/src/share/vm/utilities/debug.hpp
index 381cfd63bae..414316990a0 100644
--- a/hotspot/src/share/vm/utilities/debug.hpp
+++ b/hotspot/src/share/vm/utilities/debug.hpp
@@ -222,9 +222,8 @@ void warning(const char* format, ...) ATTRIBUTE_PRINTF(1, 2);
 template<bool x> struct STATIC_ASSERT_FAILURE;
 template<> struct STATIC_ASSERT_FAILURE<true> { enum { value = 1 }; };
 
-#define STATIC_ASSERT(Cond)                             \
-  typedef char STATIC_ASSERT_FAILURE_ ## __LINE__ [     \
-    STATIC_ASSERT_FAILURE< (Cond) >::value ]
+#define STATIC_ASSERT(Cond) \
+  typedef char STATIC_ASSERT_DUMMY_TYPE[ STATIC_ASSERT_FAILURE< (Cond) >::value ]
 
 // out of shared space reporting
 enum SharedSpaceType {