summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2013-01-05 00:32:04 +0000
committerEric Christopher <echristo@gmail.com>2013-01-05 00:32:04 +0000
commit22f3b40d0bd18f2ad092398d18195c20ceeb1bef (patch)
tree86e0c6cbaf8b7ffd9eea57731d25afc3fbd134f0
parent234aaf08c8b81127a765b2d991cafe146502853c (diff)
downloadllvm-22f3b40d0bd18f2ad092398d18195c20ceeb1bef.tar.gz
llvm-22f3b40d0bd18f2ad092398d18195c20ceeb1bef.tar.bz2
llvm-22f3b40d0bd18f2ad092398d18195c20ceeb1bef.tar.xz
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
-rw-r--r--include/llvm/Object/ELF.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/llvm/Object/ELF.h b/include/llvm/Object/ELF.h
index 38bd73a0f3..56eb268bcf 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};