@@ -167,7 +167,7 @@ public:

     unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+

       KeyLength+1;

-    unsigned Alignment = alignof<StringMapEntry>();

+    unsigned Alignment = alignofLLVM<StringMapEntry>();

     StringMapEntry *NewItem =

       static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));

@@ -18,6 +18,7 @@

 #define LLVM_CODEGEN_JITCODEEMITTER_H

 #include <string>

+#include <algorithm>

 #include "llvm/System/DataTypes.h"

 #include "llvm/Support/MathExtras.h"

 #include "llvm/CodeGen/MachineCodeEmitter.h"

@@ -415,7 +415,7 @@ namespace llvm {

       IndexListEntry *entry =

         static_cast<IndexListEntry*>(

           ileAllocator.Allocate(sizeof(IndexListEntry),

-          alignof<IndexListEntry>()));

+          alignofLLVM<IndexListEntry>()));

       new (entry) IndexListEntry(mi, index);

@@ -49,12 +49,13 @@ struct AlignOf {

 };

+// This is a built in function in C++11.  We have to rename this.

 /// 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.

 template <typename T>

-static inline unsigned alignof() { return AlignOf<T>::Alignment; }

+static inline unsigned alignofLLVM() { return AlignOf<T>::Alignment; }

 } // end namespace llvm

 #endif

@@ -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, alignofLLVM<T>());

         if (Ptr + sizeof(T) <= End)

           reinterpret_cast<T*>(Ptr)->~T();

       }

@@ -11,6 +11,7 @@

 //

 //===----------------------------------------------------------------------===//

+#include <algorithm>

 #include "llvm/Support/Debug.h"

 #include "llvm/Support/FormattedStream.h"