3fc5264
Index: include/llvm/ADT/StringMap.h
3fc5264
===================================================================
3fc5264
--- include/llvm/ADT/StringMap.h	(revision 117773)
3fc5264
+++ include/llvm/ADT/StringMap.h	(revision 117774)
3fc5264
@@ -167,7 +167,7 @@
3fc5264
 
3fc5264
     unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+
3fc5264
       KeyLength+1;
3fc5264
-    unsigned Alignment = alignof<StringMapEntry>();
3fc5264
+    unsigned Alignment = alignOf<StringMapEntry>();
3fc5264
 
3fc5264
     StringMapEntry *NewItem =
3fc5264
       static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));
3fc5264
Index: include/llvm/Support/AlignOf.h
3fc5264
===================================================================
3fc5264
--- include/llvm/Support/AlignOf.h	(revision 117773)
3fc5264
+++ include/llvm/Support/AlignOf.h	(revision 117774)
3fc5264
@@ -49,12 +49,12 @@
3fc5264
 
3fc5264
 };
3fc5264
 
3fc5264
-/// alignof - A templated function that returns the mininum alignment of
3fc5264
+/// alignOf - A templated function that returns the mininum alignment of
3fc5264
 ///  of a type.  This provides no extra functionality beyond the AlignOf
3fc5264
 ///  class besides some cosmetic cleanliness.  Example usage:
3fc5264
-///  alignof<int>() returns the alignment of an int.
3fc5264
+///  alignOf<int>() returns the alignment of an int.
3fc5264
 template <typename T>
3fc5264
-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
3fc5264
+static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
3fc5264
 
3fc5264
 } // end namespace llvm
3fc5264
 #endif
3fc5264
Index: include/llvm/Support/Allocator.h
3fc5264
===================================================================
3fc5264
--- include/llvm/Support/Allocator.h	(revision 117773)
3fc5264
+++ include/llvm/Support/Allocator.h	(revision 117774)
3fc5264
@@ -201,7 +201,7 @@
3fc5264
       char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr :
3fc5264
                                               (char *)Slab + Slab->Size;
3fc5264
       for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
3fc5264
-        Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
3fc5264
+        Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
3fc5264
         if (Ptr + sizeof(T) <= End)
3fc5264
           reinterpret_cast<T*>(Ptr)->~T();
3fc5264
       }
3fc5264
Index: include/llvm/CodeGen/SlotIndexes.h
3fc5264
===================================================================
3fc5264
--- include/llvm/CodeGen/SlotIndexes.h	(revision 117773)
3fc5264
+++ include/llvm/CodeGen/SlotIndexes.h	(revision 117774)
3fc5264
@@ -393,7 +393,7 @@
3fc5264
       IndexListEntry *entry =
3fc5264
         static_cast<IndexListEntry*>(
3fc5264
           ileAllocator.Allocate(sizeof(IndexListEntry),
3fc5264
-          alignof<IndexListEntry>()));
3fc5264
+          alignOf<IndexListEntry>()));
3fc5264
 
3fc5264
       new (entry) IndexListEntry(mi, index);
3fc5264