From: Eric Christopher <echristo@gmail.com>
Date: Sat, 5 Jan 2013 00:32:04 +0000 (+0000)
Subject: Make this an integer so we have enumeral types in the conditional
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=22f3b40d0bd18f2ad092398d18195c20ceeb1bef;p=oota-llvm.git

Make this an integer so we have enumeral types in the conditional
expression.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171571 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h
index 38bd73a0f3b..56eb268bcf6 100644
--- a/include/llvm/Object/ELF.h
+++ b/include/llvm/Object/ELF.h
@@ -35,7 +35,7 @@ namespace object {
 
 using support::endianness;
 
-template<typename T, std::size_t max_align>
+template<typename T, int max_align>
 struct MaximumAlignment {
   enum {value = AlignOf<T>::Alignment > max_align ? max_align
                                                   : AlignOf<T>::Alignment};