From 75ba212653cc586dac075bd794efe1ecde26a139 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Tue, 15 Apr 2014 00:22:53 +0000 Subject: [PATCH] [Allocator] Hack around the fact that GCC can't compile the static_assert added in r206225. I'm looking into a proper fix, but wanted the bots back. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206226 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Allocator.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/llvm/Support/Allocator.h b/include/llvm/Support/Allocator.h index a28080187b6..5eccbccbfc2 100644 --- a/include/llvm/Support/Allocator.h +++ b/include/llvm/Support/Allocator.h @@ -50,12 +50,14 @@ public: /// \brief Allocate \a Size bytes of \a Alignment aligned memory. This method /// must be implemented by \c DerivedT. void *Allocate(size_t Size, size_t Alignment) { +#ifdef __clang__ static_assert(static_cast( &AllocatorBase::Allocate) != static_cast( &DerivedT::Allocate), "Class derives from AllocatorBase without implementing the " "core Allocate(size_t, size_t) overload!"); +#endif return static_cast(this)->Allocate(Size, Alignment); }