diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-10-30 05:14:01 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-10-30 05:14:01 +0000 |
| commit | 16c3b647eb100fe404ee65f106d563ddef6c74b7 (patch) | |
| tree | 14f84f8de4f8628bcbce11171bab3d89c8237cae /include/llvm/Support/Allocator.h | |
| parent | 9a82e7027549bfc8655b090b37e709baa3cd3240 (diff) | |
| download | llvm-16c3b647eb100fe404ee65f106d563ddef6c74b7.tar.gz llvm-16c3b647eb100fe404ee65f106d563ddef6c74b7.tar.bz2 llvm-16c3b647eb100fe404ee65f106d563ddef6c74b7.tar.xz | |
Rename alignof -> alignOf to avoid irritating C++'0x compilers,
PR8423, patch by nobled.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117774 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/llvm/Support/Allocator.h')
| -rw-r--r-- | include/llvm/Support/Allocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/Support/Allocator.h b/include/llvm/Support/Allocator.h index 0b7151a72c..f3c53d14e5 100644 --- a/include/llvm/Support/Allocator.h +++ b/include/llvm/Support/Allocator.h @@ -201,7 +201,7 @@ public: char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr : (char *)Slab + Slab->Size; for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) { - Ptr = Allocator.AlignPtr(Ptr, alignof<T>()); + Ptr = Allocator.AlignPtr(Ptr, alignOf<T>()); if (Ptr + sizeof(T) <= End) reinterpret_cast<T*>(Ptr)->~T(); } |