commit 3248854a5d16e1de17c58e05f726bdef9f042df2
author Chris Lattner <sabre@nondot.org> Sat Oct 30 05:14:06 2010 +0000
committer Chris Lattner <sabre@nondot.org> Sat Oct 30 05:14:06 2010 +0000
tree 38eacc4ba042e0ec613bc7394d1a003a03a7bde1
parent acec34bda4a765fd05ed10e5aa83bc93dac072c1

Rename alignof -> alignOf to avoid irritating C++'0x compilers,
PR8423


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@117775 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/TokenLexer.cpp

diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index 94719b0..a0e5ae3 100644
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -287,7 +287,7 @@
     llvm::BumpPtrAllocator &Alloc = PP.getPreprocessorAllocator();
     Token *Res =
       static_cast<Token *>(Alloc.Allocate(sizeof(Token)*ResultToks.size(),
-                                          llvm::alignof<Token>()));
+                                          llvm::alignOf<Token>()));
     if (NumTokens)
       memcpy(Res, &ResultToks[0], NumTokens*sizeof(Token));
     Tokens = Res;