summaryrefslogtreecommitdiffstats
path: root/llvm/include
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2014-04-15 08:14:48 +0000
committerChandler Carruth <chandlerc@gmail.com>2014-04-15 08:14:48 +0000
commit553283e57d385fc5f3bb34f41911b9a15f1ccf81 (patch)
tree973739f77aeae2dc1e5fb591af81d0fe5d1434e7 /llvm/include
parentc359ad00a689fabdf9cfa3b070efc1528452cf06 (diff)
downloadbcm5719-llvm-553283e57d385fc5f3bb34f41911b9a15f1ccf81.tar.gz
bcm5719-llvm-553283e57d385fc5f3bb34f41911b9a15f1ccf81.zip
[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. llvm-svn: 206259
Diffstat (limited to 'llvm/include')
-rw-r--r--llvm/include/llvm/Support/Allocator.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/include/llvm/Support/Allocator.h b/llvm/include/llvm/Support/Allocator.h
index 034661f4bcd..617ab9fd7a3 100644
--- a/llvm/include/llvm/Support/Allocator.h
+++ b/llvm/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));
}
OpenPOWER on IntegriCloud