]> granicus.if.org Git - clang/commitdiff
Use AlignOf instead of alignOf so that this can go back to being a static_assert...
authorAaron Ballman <aaron@aaronballman.com>
Tue, 7 Jul 2015 17:12:14 +0000 (17:12 +0000)
committerAaron Ballman <aaron@aaronballman.com>
Tue, 7 Jul 2015 17:12:14 +0000 (17:12 +0000)
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@241604 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AST/DeclObjC.cpp

index d15cc88c39c3c7dd813df6cf4d77d498fd7c31b7..927988f960adfa4fb2c35b953d83e2b1bf387af9 100644 (file)
@@ -1266,9 +1266,9 @@ ObjCTypeParamList *ObjCTypeParamList::create(
                      SourceLocation rAngleLoc) {
   unsigned size = sizeof(ObjCTypeParamList)
                 + sizeof(ObjCTypeParamDecl *) * typeParams.size();
-  assert(llvm::alignOf<ObjCTypeParamList>() >=
-             llvm::alignOf<ObjCTypeParamDecl *>() &&
-         "type parameter list needs greater alignment");
+  static_assert(llvm::AlignOf<ObjCTypeParamList>::Alignment >=
+                    llvm::AlignOf<ObjCTypeParamDecl *>::Alignment,
+                "type parameter list needs greater alignment");
   unsigned align = llvm::alignOf<ObjCTypeParamList>();
   void *mem = ctx.Allocate(size, align);
   return new (mem) ObjCTypeParamList(lAngleLoc, typeParams, rAngleLoc);