commit 5c0b40528d46ca9707914171660563dcd55293ee
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 c657c07b0a296368dcbe0ba64fe0bfda28abfc2e
parent fa898b2b24a5381fe3dcae1f2ce882bad04d9fee

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

llvm-svn: 117775

clang/lib/Lex/TokenLexer.cpp

diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp
index 94719b0..a0e5ae3 100644
--- a/clang/lib/Lex/TokenLexer.cpp
+++ b/clang/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;