commit f0bf6897b9791553eaa3a18e74028b0541339bf5
author Jeff Sharkey <jsharkey@android.com> Thu Sep 14 16:49:01 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 14 16:49:01 2017 +0000
tree 9f5d7b57bd5b20b0c78ff969fc30ff1ef94ec7de
parent a88d957f97e995d9a0b7a716c2c3f8b09445c2b9
parent 9d5ce46ae16db0b7bfcf720987f555cd872a7b62

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

Change-Id: I699fcaab38beacfa622c379e0ec3cc35fccd1add

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