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/AST/DeclCXX.cpp

diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp
index 88ede82..17f2dfd 100644
--- a/lib/AST/DeclCXX.cpp
+++ b/lib/AST/DeclCXX.cpp
@@ -1057,7 +1057,7 @@
                                    unsigned NumIndices) {
   void *Mem = Context.Allocate(sizeof(CXXBaseOrMemberInitializer) +
                                sizeof(VarDecl *) * NumIndices,
-                               llvm::alignof<CXXBaseOrMemberInitializer>());
+                               llvm::alignOf<CXXBaseOrMemberInitializer>());
   return new (Mem) CXXBaseOrMemberInitializer(Context, Member, MemberLoc,
                                               L, Init, R, Indices, NumIndices);
 }