From: Chandler Carruth <chandlerc@gmail.com>
Date: Tue, 15 Apr 2014 08:14:48 +0000 (+0000)
Subject: [Allocator] Fix r206256 which got the enabling case backwards on these
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d5b514ed23e370fde2425116f283bf89a6a07596;p=oota-llvm.git

[Allocator] Fix r206256 which got the enabling case backwards on these
overloads. This doesn't matter *that* much yet, but it will in
a subsequent patch. I had tested the original pattern, but not my
attempt to pacify MSVC. This at least appears to work. Still fixing the
rest of the fallout in the final patch that uses these overloads, but it
will follow shortly.

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

diff --git a/include/llvm/Support/Allocator.h b/include/llvm/Support/Allocator.h
index 034661f4bcd..617ab9fd7a3 100644
--- a/include/llvm/Support/Allocator.h
+++ b/include/llvm/Support/Allocator.h
@@ -99,7 +99,7 @@ public:
   /// \brief Deallocate space for one object without destroying it.
   template <typename T>
   typename std::enable_if<
-      std::is_same<typename std::remove_cv<T>::type, void>::value, void>::type
+      !std::is_same<typename std::remove_cv<T>::type, void>::value, void>::type
   Deallocate(T *Ptr) {
     Deallocate(static_cast<const void *>(Ptr));
   }
@@ -107,7 +107,7 @@ public:
   /// \brief Allocate space for an array of objects without constructing them.
   template <typename T>
   typename std::enable_if<
-      std::is_same<typename std::remove_cv<T>::type, void>::value, void>::type
+      !std::is_same<typename std::remove_cv<T>::type, void>::value, void>::type
   Deallocate(T *Ptr, size_t /*Num*/) {
     Deallocate(static_cast<const void *>(Ptr));
   }