diff options
| -rw-r--r-- | clang/include/clang/ASTMatchers/ASTMatchersInternal.h | 2 | ||||
| -rw-r--r-- | clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h | 16 | ||||
| -rw-r--r-- | clang/lib/Lex/PPDirectives.cpp | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/clang/include/clang/ASTMatchers/ASTMatchersInternal.h b/clang/include/clang/ASTMatchers/ASTMatchersInternal.h index 9aeb4f9fd76..b3bb3ca7509 100644 --- a/clang/include/clang/ASTMatchers/ASTMatchersInternal.h +++ b/clang/include/clang/ASTMatchers/ASTMatchersInternal.h @@ -52,7 +52,7 @@ namespace clang { namespace ast_matchers { -/// TODO: Use LLVM_STATIC_ASSERT() instead of this. +/// TODO: Use static_assert instead of this. template <bool> struct CompileAssert {}; #define TOOLING_COMPILE_ASSERT(Expr, Msg) LLVM_ATTRIBUTE_UNUSED \ typedef CompileAssert<(bool(Expr))> Msg[bool(Expr) ? 1 : -1] diff --git a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h index 7eca8431376..fe1a65d47e7 100644 --- a/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h +++ b/clang/include/clang/StaticAnalyzer/Core/PathSensitive/CallEvent.h @@ -915,23 +915,23 @@ class CallEventManager { template <typename T, typename Arg> T *create(Arg A, ProgramStateRef St, const LocationContext *LCtx) { - LLVM_STATIC_ASSERT(sizeof(T) == sizeof(CallEventTemplateTy), - "CallEvent subclasses are not all the same size"); + static_assert(sizeof(T) == sizeof(CallEventTemplateTy), + "CallEvent subclasses are not all the same size"); return new (allocate()) T(A, St, LCtx); } template <typename T, typename Arg1, typename Arg2> T *create(Arg1 A1, Arg2 A2, ProgramStateRef St, const LocationContext *LCtx) { - LLVM_STATIC_ASSERT(sizeof(T) == sizeof(CallEventTemplateTy), - "CallEvent subclasses are not all the same size"); + static_assert(sizeof(T) == sizeof(CallEventTemplateTy), + "CallEvent subclasses are not all the same size"); return new (allocate()) T(A1, A2, St, LCtx); } template <typename T, typename Arg1, typename Arg2, typename Arg3> T *create(Arg1 A1, Arg2 A2, Arg3 A3, ProgramStateRef St, const LocationContext *LCtx) { - LLVM_STATIC_ASSERT(sizeof(T) == sizeof(CallEventTemplateTy), - "CallEvent subclasses are not all the same size"); + static_assert(sizeof(T) == sizeof(CallEventTemplateTy), + "CallEvent subclasses are not all the same size"); return new (allocate()) T(A1, A2, A3, St, LCtx); } @@ -939,8 +939,8 @@ class CallEventManager { typename Arg4> T *create(Arg1 A1, Arg2 A2, Arg3 A3, Arg4 A4, ProgramStateRef St, const LocationContext *LCtx) { - LLVM_STATIC_ASSERT(sizeof(T) == sizeof(CallEventTemplateTy), - "CallEvent subclasses are not all the same size"); + static_assert(sizeof(T) == sizeof(CallEventTemplateTy), + "CallEvent subclasses are not all the same size"); return new (allocate()) T(A1, A2, A3, A4, St, LCtx); } diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp index 4a9e09f798e..050ade45e44 100644 --- a/clang/lib/Lex/PPDirectives.cpp +++ b/clang/lib/Lex/PPDirectives.cpp @@ -60,8 +60,8 @@ MacroInfo *Preprocessor::AllocateMacroInfo(SourceLocation L) { MacroInfo *Preprocessor::AllocateDeserializedMacroInfo(SourceLocation L, unsigned SubModuleID) { - LLVM_STATIC_ASSERT(llvm::AlignOf<MacroInfo>::Alignment >= sizeof(SubModuleID), - "alignment for MacroInfo is less than the ID"); + static_assert(llvm::AlignOf<MacroInfo>::Alignment >= sizeof(SubModuleID), + "alignment for MacroInfo is less than the ID"); DeserializedMacroInfoChain *MIChain = BP.Allocate<DeserializedMacroInfoChain>(); MIChain->Next = DeserialMIChainHead; |
