commit 28ebfe18fb846ae034e3a45421d9d28c1c5f70db
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 13 20:35:38 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 13 20:35:38 2017 +0000
tree 5101398df8aa56bc1393ea3eaf4e6eec60d70fe9
parent 1f666a6be9c9e01ccdf3ac45f6f642e3d513676f
parent 147b881ca906ad3f7f1b9acf20304054df3e5ea1

Merge "Add "operator bool" overload to android::sp."

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