summaryrefslogtreecommitdiffstats
path: root/clang/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
commit5c0b40528d46ca9707914171660563dcd55293ee (patch)
treec657c07b0a296368dcbe0ba64fe0bfda28abfc2e /clang/lib/Lex/TokenLexer.cpp
parentfa898b2b24a5381fe3dcae1f2ce882bad04d9fee (diff)
downloadbcm5719-llvm-5c0b40528d46ca9707914171660563dcd55293ee.tar.gz
bcm5719-llvm-5c0b40528d46ca9707914171660563dcd55293ee.zip
Rename alignof -> alignOf to avoid irritating C++'0x compilers,
PR8423 llvm-svn: 117775
Diffstat (limited to 'clang/lib/Lex/TokenLexer.cpp')
-rw-r--r--clang/lib/Lex/TokenLexer.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Lex/TokenLexer.cpp b/clang/lib/Lex/TokenLexer.cpp
index 94719b0baa3..a0e5ae33b26 100644
--- a/clang/lib/Lex/TokenLexer.cpp
+++ b/clang/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;
OpenPOWER on IntegriCloud