changeset 29692:26a04a7a88df

Merge
author ehelin
date Thu, 19 Mar 2015 10:29:36 +0000
parents 02ce43f0f95a c539e3e94ef1
children fac175f7a466
files
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/utilities/debug.hpp	Wed Mar 18 10:51:00 2015 +0100
+++ b/hotspot/src/share/vm/utilities/debug.hpp	Thu Mar 19 10:29:36 2015 +0000
@@ -222,9 +222,8 @@
 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 {