# HG changeset patch
# User jwilhelm
# Date 1449509367 0
# Node ID 3080f4a935d8a9980c6e9081eec7ccf19218e6ca
# Parent  9a1d11d88ea0643082962a3304625602e0625aa7# Parent  501b8f1784c4cf51de78bf34199ed88fe6dbad3b
Merge

diff -r 9a1d11d88ea0 -r 3080f4a935d8 hotspot/src/share/vm/logging/logTag.hpp
--- a/hotspot/src/share/vm/logging/logTag.hpp	Fri Dec 04 15:24:14 2015 -0800
+++ b/hotspot/src/share/vm/logging/logTag.hpp	Mon Dec 07 17:29:27 2015 +0000
@@ -38,7 +38,7 @@
   LOG_TAG(safepoint) \
   LOG_TAG(vmoperation)
 
-#define PREFIX_LOG_TAG(T) (LogTag::T)
+#define PREFIX_LOG_TAG(T) (LogTag::_##T)
 
 // Expand a set of log tags to their prefixed names.
 // For error detection purposes, the macro passes one more tag than what is supported.
@@ -47,7 +47,7 @@
                                                         PREFIX_LOG_TAG(T3), PREFIX_LOG_TAG(T4), PREFIX_LOG_TAG(T5)
 // The EXPAND_VARARGS macro is required for MSVC, or it will resolve the LOG_TAGS_EXPANDED macro incorrectly.
 #define EXPAND_VARARGS(x) x
-#define LOG_TAGS(...) EXPAND_VARARGS(LOG_TAGS_EXPANDED(__VA_ARGS__, __NO_TAG, __NO_TAG, __NO_TAG, __NO_TAG, __NO_TAG, __NO_TAG))
+#define LOG_TAGS(...) EXPAND_VARARGS(LOG_TAGS_EXPANDED(__VA_ARGS__, _NO_TAG, _NO_TAG, _NO_TAG, _NO_TAG, _NO_TAG, _NO_TAG))
 
 // Log tags are used to classify log messages.
 // Each log message can be assigned between 1 to LogTag::MaxTags number of tags.
@@ -63,7 +63,7 @@
 
   enum type {
     __NO_TAG,
-#define LOG_TAG(name) name,
+#define LOG_TAG(name) _##name,
     LOG_TAG_LIST
 #undef LOG_TAG
     Count