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 | |
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
-rw-r--r-- | include/llvm/ADT/StringMap.h | 2 | ||||
-rw-r--r-- | include/llvm/CodeGen/SlotIndexes.h | 2 | ||||
-rw-r--r-- | include/llvm/Support/AlignOf.h | 6 | ||||
-rw-r--r-- | include/llvm/Support/Allocator.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/llvm/ADT/StringMap.h b/include/llvm/ADT/StringMap.h index 4d8dd64b0b..d047a42079 100644 --- a/include/llvm/ADT/StringMap.h +++ b/include/llvm/ADT/StringMap.h @@ -167,7 +167,7 @@ public: unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+ KeyLength+1; - unsigned Alignment = alignof<StringMapEntry>(); + unsigned Alignment = alignOf<StringMapEntry>(); StringMapEntry *NewItem = static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment)); diff --git a/include/llvm/CodeGen/SlotIndexes.h b/include/llvm/CodeGen/SlotIndexes.h index 98426f019c..4b7721b996 100644 --- a/include/llvm/CodeGen/SlotIndexes.h +++ b/include/llvm/CodeGen/SlotIndexes.h @@ -393,7 +393,7 @@ namespace llvm { IndexListEntry *entry = static_cast<IndexListEntry*>( ileAllocator.Allocate(sizeof(IndexListEntry), - alignof<IndexListEntry>())); + alignOf<IndexListEntry>())); new (entry) IndexListEntry(mi, index); diff --git a/include/llvm/Support/AlignOf.h b/include/llvm/Support/AlignOf.h index 6a7a1a6bd2..979e5975aa 100644 --- a/include/llvm/Support/AlignOf.h +++ b/include/llvm/Support/AlignOf.h @@ -49,12 +49,12 @@ struct AlignOf { }; -/// alignof - A templated function that returns the mininum alignment of +/// alignOf - A templated function that returns the mininum alignment of /// of a type. This provides no extra functionality beyond the AlignOf /// class besides some cosmetic cleanliness. Example usage: -/// alignof<int>() returns the alignment of an int. +/// alignOf<int>() returns the alignment of an int. template <typename T> -static inline unsigned alignof() { return AlignOf<T>::Alignment; } +static inline unsigned alignOf() { return AlignOf<T>::Alignment; } } // end namespace llvm #endif 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(); } |