[cfe-commits] r122991 - in /cfe/trunk: include/clang/AST/Type.h lib/AST/TypePrinter.cpp

[Francois Pichet]

Author: fpichet
Date: Thu Jan  6 20:58:13 2011
New Revision: 122991

URL: http://llvm.org/viewvc/llvm-project?rev=122991&view=rev
Log:
Do not use cdecl, fastcall, stdcall etc.. as identifier name. They are reserved keywords at least on MSVC.

Modified:
    cfe/trunk/include/clang/AST/Type.h
    cfe/trunk/lib/AST/TypePrinter.cpp

Modified: cfe/trunk/include/clang/AST/Type.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/Type.h?rev=122991&r1=122990&r2=122991&view=diff
==============================================================================
--- cfe/trunk/include/clang/AST/Type.h (original)
+++ cfe/trunk/include/clang/AST/Type.h Thu Jan  6 20:58:13 2011
@@ -2710,12 +2710,12 @@
     LastEnumOperandKind = objc_gc,
 
     // No operand.
-    noreturn,
-    cdecl,
-    fastcall,
-    stdcall,
-    thiscall,
-    pascal
+    attr_noreturn,
+    attr_cdecl,
+    attr_fastcall,
+    attr_stdcall,
+    attr_thiscall,
+    attr_pascal
   };
 
 private:

Modified: cfe/trunk/lib/AST/TypePrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/TypePrinter.cpp?rev=122991&r1=122990&r2=122991&view=diff
==============================================================================
--- cfe/trunk/lib/AST/TypePrinter.cpp (original)
+++ cfe/trunk/lib/AST/TypePrinter.cpp Thu Jan  6 20:58:13 2011
@@ -742,12 +742,12 @@
     break;
   }
 
-  case AttributedType::noreturn: S += "noreturn"; break;
-  case AttributedType::cdecl: S += "cdecl"; break;
-  case AttributedType::fastcall: S += "fastcall"; break;
-  case AttributedType::stdcall: S += "stdcall"; break;
-  case AttributedType::thiscall: S += "thiscall"; break;
-  case AttributedType::pascal: S += "pascal"; break;
+  case AttributedType::attr_noreturn: S += "noreturn"; break;
+  case AttributedType::attr_cdecl: S += "cdecl"; break;
+  case AttributedType::attr_fastcall: S += "fastcall"; break;
+  case AttributedType::attr_stdcall: S += "stdcall"; break;
+  case AttributedType::attr_thiscall: S += "thiscall"; break;
+  case AttributedType::attr_pascal: S += "pascal"; break;
   }
   S += "))";
 }