Prospective MSVC 2010 build fix

Try to fix Compiler Error C2011 following r198607 by removing enum from 'enum
TokenKind' parameter types.

llvm-svn: 198621

diff --git a/clang/include/clang/Basic/TokenKinds.h b/clang/include/clang/Basic/TokenKinds.h
index 5ba168e..bca267f 100644 (file)
--- a/clang/include/clang/Basic/TokenKinds.h
+++ b/clang/include/clang/Basic/TokenKinds.h
@@ -54,7 +54,7 @@ enum OnOffSwitch {
 ///
 /// The name of a token will be an internal name (such as "l_square")
 /// and should not be used as part of diagnostic messages.
-const char *getTokenName(enum TokenKind Kind) LLVM_READNONE;
+const char *getTokenName(TokenKind Kind) LLVM_READNONE;
 
 /// \brief Determines the spelling of simple punctuation tokens like
 /// '!' or '%', and returns NULL for literal and annotation tokens.
@@ -63,11 +63,11 @@ const char *getTokenName(enum TokenKind Kind) LLVM_READNONE;
 /// and will not produce any alternative spellings (e.g., a
 /// digraph). For the actual spelling of a given Token, use
 /// Preprocessor::getSpelling().
-const char *getPunctuatorSpelling(enum TokenKind Kind) LLVM_READNONE;
+const char *getPunctuatorSpelling(TokenKind Kind) LLVM_READNONE;
 
 /// \brief Determines the spelling of simple keyword and contextual keyword
 /// tokens like 'int' and 'dynamic_cast'. Returns NULL for other token kinds.
-const char *getKeywordSpelling(enum TokenKind Kind) LLVM_READNONE;
+const char *getKeywordSpelling(TokenKind Kind) LLVM_READNONE;
 
 /// \brief Return true if this is a raw identifier or an identifier kind.
 inline bool isAnyIdentifier(TokenKind K) {

diff --git a/clang/lib/Basic/TokenKinds.cpp b/clang/lib/Basic/TokenKinds.cpp
index 50fe0a6..92fc2a2 100644 (file)
--- a/clang/lib/Basic/TokenKinds.cpp
+++ b/clang/lib/Basic/TokenKinds.cpp
@@ -22,14 +22,14 @@ static const char * const TokNames[] = {
   0
 };
 
-const char *tok::getTokenName(enum TokenKind Kind) {
+const char *tok::getTokenName(TokenKind Kind) {
   if (Kind < tok::NUM_TOKENS)
     return TokNames[Kind];
   llvm_unreachable("unknown TokenKind");
   return 0;
 }
 
-const char *tok::getPunctuatorSpelling(enum TokenKind Kind) {
+const char *tok::getPunctuatorSpelling(TokenKind Kind) {
   switch (Kind) {
 #define PUNCTUATOR(X,Y) case X: return Y;
 #include "clang/Basic/TokenKinds.def"
@@ -38,7 +38,7 @@ const char *tok::getPunctuatorSpelling(enum TokenKind Kind) {
   return 0;
 }
 
-const char *tok::getKeywordSpelling(enum TokenKind Kind) {
+const char *tok::getKeywordSpelling(TokenKind Kind) {
   switch (Kind) {
 #define KEYWORD(X,Y) case kw_ ## X: return #X;
 #include "clang/Basic/TokenKinds.def"