diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-05-15 21:43:59 +0200 |
| commit | b2e3c7da703d4c3dda41d4f1e18cd976e6c4381a (patch) | |
| tree | 7462cd2988228ae24c40b37a9382d35874bbf099 /include/llvm/ADT/OwningPtr.h | |
| parent | 23d8d191eff180ba312a4d1b4fec8597e5a988d5 (diff) | |
| parent | 4ef61f2ad4ff509ee05c7051d359009511f81226 (diff) | |
| download | llvm-embtk-support-master.tar.gz llvm-embtk-support-master.tar.bz2 llvm-embtk-support-master.tar.xz | |
Merge branch 'master' into embtk-support-masterembtk-support-master
Diffstat (limited to 'include/llvm/ADT/OwningPtr.h')
| -rw-r--r-- | include/llvm/ADT/OwningPtr.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/llvm/ADT/OwningPtr.h b/include/llvm/ADT/OwningPtr.h index 86f9feee2c..6b9e42eaec 100644 --- a/include/llvm/ADT/OwningPtr.h +++ b/include/llvm/ADT/OwningPtr.h @@ -70,8 +70,9 @@ public: T *operator->() const { return Ptr; } T *get() const { return Ptr; } - operator bool() const { return Ptr != 0; } + LLVM_EXPLICIT operator bool() const { return Ptr != 0; } bool operator!() const { return Ptr == 0; } + bool isValid() const { return Ptr != 0; } void swap(OwningPtr &RHS) { T *Tmp = RHS.Ptr; @@ -132,7 +133,7 @@ public: } T *get() const { return Ptr; } - operator bool() const { return Ptr != 0; } + LLVM_EXPLICIT operator bool() const { return Ptr != 0; } bool operator!() const { return Ptr == 0; } void swap(OwningArrayPtr &RHS) { |