From e444a76147f9702259ad25d731bd38e96940e9d0 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Tue, 10 Jan 2017 00:29:05 +0000 Subject: [PATCH] Revert the attempt to optimize the constexpr functions. MSVC does not handle this yet git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@291515 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/AlignOf.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/include/llvm/Support/AlignOf.h b/include/llvm/Support/AlignOf.h index e1e304f4c1a..de2f1add0b1 100644 --- a/include/llvm/Support/AlignOf.h +++ b/include/llvm/Support/AlignOf.h @@ -110,15 +110,14 @@ namespace detail { template constexpr size_t aligner() { return alignof(T1); } template constexpr size_t aligner() { - size_t rest = aligner(); - return (alignof(T1) > rest) ? alignof(T1) : rest; + return (alignof(T1) > aligner()) ? alignof(T1) + : aligner(); } template constexpr size_t sizer() { return sizeof(T1); } template constexpr size_t sizer() { - size_t rest = sizer(); - return (sizeof(T1) > rest) ? sizeof(T1) : rest; + return (sizeof(T1) > sizer()) ? sizeof(T1) : sizer(); } } // end namespace detail -- 2.40.0