commit 9c02a26f731e61fa9617aa6c7a74d76eaa5c262d
author Jeff Sharkey <jsharkey@android.com> Wed Sep 13 23:14:06 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Sep 13 23:14:06 2017 +0000
tree 1718a57afb2d0345066e6f592406764d216bb7df
parent 9f72a5eaef15796db7fa0b58116d1ef934ec0101
parent 5ae1dcd8fc870252e01ffa62887db219366aff28

Merge "Add "operator bool" overload to android::sp." am: 28ebfe18fb
am: 56c22732c6

Change-Id: I0068bb0fee78b62abe97175b2594b579b6fc8f81

libutils/include/utils/StrongPointer.h

diff --git a/libutils/include/utils/StrongPointer.h b/libutils/include/utils/StrongPointer.h
index 0c20607..ae6d9c8 100644
--- a/libutils/include/utils/StrongPointer.h
+++ b/libutils/include/utils/StrongPointer.h
@@ -82,9 +82,10 @@
 
     // Accessors
 
-    inline  T&      operator* () const  { return *m_ptr; }
-    inline  T*      operator-> () const { return m_ptr;  }
-    inline  T*      get() const         { return m_ptr; }
+    inline T&       operator* () const     { return *m_ptr; }
+    inline T*       operator-> () const    { return m_ptr;  }
+    inline T*       get() const            { return m_ptr; }
+    inline explicit operator bool () const { return m_ptr != nullptr; }
 
     // Operators