diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2014-04-15 08:14:48 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2014-04-15 08:14:48 +0000 |
| commit | d5b514ed23e370fde2425116f283bf89a6a07596 (patch) | |
| tree | 4b8ac15da5877d45ac8ba0558a714c9c28ea1f0a /include/llvm/Support | |
| parent | b6ecb4f8aba89e24410204439fc80565fa00e2ba (diff) | |
| download | llvm-d5b514ed23e370fde2425116f283bf89a6a07596.tar.gz llvm-d5b514ed23e370fde2425116f283bf89a6a07596.tar.bz2 llvm-d5b514ed23e370fde2425116f283bf89a6a07596.tar.xz | |
[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
Diffstat (limited to 'include/llvm/Support')
| -rw-r--r-- | include/llvm/Support/Allocator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/llvm/Support/Allocator.h b/include/llvm/Support/Allocator.h index 034661f4bc..617ab9fd7a 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)); } |