summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2014-06-03 05:05:15 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2014-06-03 05:05:15 +0000
commitc7dd10b2211fdba998d6ebd0a8a4c8abd9dd6040 (patch)
tree0afe94a670f08936a8ffe71558bb3f955b7dc6cd
parent507f1bc37e86a3488c89dc2fdfd7f402bad3b265 (diff)
downloadbcm5719-llvm-c7dd10b2211fdba998d6ebd0a8a4c8abd9dd6040.tar.gz
bcm5719-llvm-c7dd10b2211fdba998d6ebd0a8a4c8abd9dd6040.zip
Remove the last unspecified_bool_type from llvm.
llvm-svn: 210076
-rw-r--r--llvm/include/llvm/ADT/IntrusiveRefCntPtr.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h b/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h
index cd1946c54d4..295c96315a5 100644
--- a/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h
+++ b/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h
@@ -177,10 +177,7 @@ public:
T* getPtr() const { return Obj; }
- typedef T* (IntrusiveRefCntPtr::*unspecified_bool_type) () const;
- operator unspecified_bool_type() const {
- return Obj ? &IntrusiveRefCntPtr::getPtr : nullptr;
- }
+ LLVM_EXPLICIT operator bool() const { return Obj; }
void swap(IntrusiveRefCntPtr& other) {
T* tmp = other.Obj;
OpenPOWER on IntegriCloud