From 0b9b41a0d80f1520532d2212bd3d94edab889817 Mon Sep 17 00:00:00 2001 From: Alp Toker Date: Sun, 2 Mar 2014 03:20:16 +0000 Subject: [PATCH] [C++11] Expand and eliminate the LLVM_ENUM_INT_TYPE() macro git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@202606 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/AST/Comment.h | 2 +- include/clang/AST/Expr.h | 2 +- include/clang/Basic/SourceLocation.h | 2 +- lib/Sema/SemaAttr.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/clang/AST/Comment.h b/include/clang/AST/Comment.h index 4ad575b3b7..50e9196b1a 100644 --- a/include/clang/AST/Comment.h +++ b/include/clang/AST/Comment.h @@ -699,7 +699,7 @@ private: unsigned ParamIndex; public: - enum LLVM_ENUM_INT_TYPE(unsigned) { + enum : unsigned { InvalidParamIndex = ~0U, VarArgParamIndex = ~0U/*InvalidParamIndex*/ - 1U }; diff --git a/include/clang/AST/Expr.h b/include/clang/AST/Expr.h index 0db3166002..dcc24b9343 100644 --- a/include/clang/AST/Expr.h +++ b/include/clang/AST/Expr.h @@ -4636,7 +4636,7 @@ class PseudoObjectExpr : public Expr { public: /// NoResult - A value for the result index indicating that there is /// no semantic result. - enum LLVM_ENUM_INT_TYPE(unsigned) { NoResult = ~0U }; + enum : unsigned { NoResult = ~0U }; static PseudoObjectExpr *Create(const ASTContext &Context, Expr *syntactic, ArrayRef semantic, diff --git a/include/clang/Basic/SourceLocation.h b/include/clang/Basic/SourceLocation.h index 0fecfb868b..01ca9a5ac1 100644 --- a/include/clang/Basic/SourceLocation.h +++ b/include/clang/Basic/SourceLocation.h @@ -89,7 +89,7 @@ class SourceLocation { friend class SourceManager; friend class ASTReader; friend class ASTWriter; - enum LLVM_ENUM_INT_TYPE(unsigned) { + enum : unsigned { MacroIDBit = 1U << 31 }; public: diff --git a/lib/Sema/SemaAttr.cpp b/lib/Sema/SemaAttr.cpp index 6c6ba18018..2e344ff930 100644 --- a/lib/Sema/SemaAttr.cpp +++ b/lib/Sema/SemaAttr.cpp @@ -365,7 +365,7 @@ void Sema::AddCFAuditedAttribute(Decl *D) { } typedef std::vector > VisStack; -enum LLVM_ENUM_INT_TYPE(unsigned) { NoVisibility = ~0U }; +enum : unsigned { NoVisibility = ~0U }; void Sema::AddPushedVisibilityAttribute(Decl *D) { if (!VisContext) -- 2.40.0