From: Pete Cooper Date: Tue, 9 Jun 2015 18:50:18 +0000 (+0000) Subject: Change from alignof to llvm::alignOf to appease Visual Studio X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7178ff1974bc1f95e66d808d3158c9ccae49053b;p=oota-llvm.git Change from alignof to llvm::alignOf to appease Visual Studio git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@239424 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/MC/MCSymbol.cpp b/lib/MC/MCSymbol.cpp index 7eba5e0317c..e82630640ba 100644 --- a/lib/MC/MCSymbol.cpp +++ b/lib/MC/MCSymbol.cpp @@ -25,9 +25,9 @@ void *MCSymbol::operator new(size_t s, NameEntryTy *Name, MCContext &Ctx) { // For safety, ensure that the alignment of a pointer is enough for an // MCSymbol. This also ensures we don't need padding between the name and // symbol. - assert(alignOf() <= alignof(NameEntryTy *) && + assert(alignOf() <= alignOf() && "Bad alignment of MCSymbol"); - void *Storage = Ctx.allocate(Size, alignof(NameEntryTy *)); + void *Storage = Ctx.allocate(Size, alignOf()); NameEntryTy **Start = static_cast(Storage); NameEntryTy **End = Start + (Name ? 1 : 0); return End;