summaryrefslogtreecommitdiffstats
path: root/lib/Lex/TokenLexer.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2010-10-30 05:14:06 +0000
committerChris Lattner <sabre@nondot.org>2010-10-30 05:14:06 +0000
commit3248854a5d16e1de17c58e05f726bdef9f042df2 (patch)
tree38eacc4ba042e0ec613bc7394d1a003a03a7bde1 /lib/Lex/TokenLexer.cpp
parentacec34bda4a765fd05ed10e5aa83bc93dac072c1 (diff)
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
Diffstat (limited to 'lib/Lex/TokenLexer.cpp')
-rw-r--r--lib/Lex/TokenLexer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Lex/TokenLexer.cpp b/lib/Lex/TokenLexer.cpp
index 94719b0baa..a0e5ae33b2 100644
--- a/lib/Lex/TokenLexer.cpp
+++ b/lib/Lex/TokenLexer.cpp
@@ -287,7 +287,7 @@ void TokenLexer::ExpandFunctionArguments() {
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;