Remove implicit CFX_CountedRef::operator T*()

core/fxcrt/include/fx_basic.h

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #ifndef CORE_FXCRT_INCLUDE_FX_BASIC_H_
 #define CORE_FXCRT_INCLUDE_FX_BASIC_H_
 
 #include <algorithm>
@@ skipping 630 matching lines @@
     return m_BitSize >= m_BitPos ? m_BitSize - m_BitPos : 0;
   }
 
  protected:
   uint32_t m_BitPos;
 
   uint32_t m_BitSize;
 
   const uint8_t* m_pData;
 };
+
 template <class ObjClass>
 class CFX_CountRef {
  public:
-  typedef CFX_CountRef<ObjClass> Ref;
+  using Ref = CFX_CountRef<ObjClass>;
 
   class CountedObj : public ObjClass {
    public:
     CountedObj() {}
-
     CountedObj(const CountedObj& src) : ObjClass(src) {}
 
     int m_RefCount;
   };
 
-  CFX_CountRef() { m_pObject = nullptr; }
-
-  CFX_CountRef(const Ref& ref) {
-    m_pObject = ref.m_pObject;
-    if (m_pObject) {
+  CFX_CountRef() : m_pObject(nullptr) {}
+  CFX_CountRef(const Ref& ref) : m_pObject(ref.m_pObject) {
+    if (m_pObject)
       m_pObject->m_RefCount++;
-    }
   }
 
   ~CFX_CountRef() { SetNull(); }
 
   ObjClass* New() {
     SetNull();
     m_pObject = new CountedObj;
     m_pObject->m_RefCount = 1;
     return m_pObject;
   }
 
   void operator=(const Ref& ref) {
     if (ref.m_pObject)
       ref.m_pObject->m_RefCount++;
     SetNull();
     m_pObject = ref.m_pObject;
   }
 
+  bool IsNull() const { return !m_pObject; }
+  bool NotNull() const { return !IsNull(); }

[dsinclair, 2016/06/08 18:45:54]

Can we have a followup to remove this? Seems just as easy to say !IsNull then
NotNull()

+
   const ObjClass* GetObject() const { return m_pObject; }
-
-  operator const ObjClass*() const { return m_pObject; }
-
-  FX_BOOL IsNull() const { return !m_pObject; }
-
-  FX_BOOL NotNull() const { return !IsNull(); }
-
   ObjClass* GetModify() {
     if (!m_pObject) {
       m_pObject = new CountedObj;
       m_pObject->m_RefCount = 1;
     } else if (m_pObject->m_RefCount > 1) {
       m_pObject->m_RefCount--;
       CountedObj* pOldObject = m_pObject;
       m_pObject = new CountedObj(*pOldObject);
       m_pObject->m_RefCount = 1;
     }
     return m_pObject;
   }
 
   void SetNull() {
     if (!m_pObject) {
       return;
     }
     m_pObject->m_RefCount--;
     if (m_pObject->m_RefCount <= 0) {
       delete m_pObject;
     }
     m_pObject = nullptr;
   }
 
   bool operator==(const Ref& ref) const { return m_pObject == ref.m_pObject; }
 
  protected:
   CountedObj* m_pObject;
 };
+
 class IFX_Pause {
  public:
   virtual ~IFX_Pause() {}
   virtual FX_BOOL NeedToPauseNow() = 0;
 };
 
 template <typename T>
 class CFX_AutoRestorer {
  public:
   explicit CFX_AutoRestorer(T* location)
@@ skipping 188 matching lines @@
   FX_FLOAT e;
   FX_FLOAT f;
   FX_FLOAT g;
   FX_FLOAT h;
   FX_FLOAT i;
 };
 
 uint32_t GetBits32(const uint8_t* pData, int bitpos, int nbits);
 
 #endif  // CORE_FXCRT_INCLUDE_FX_BASIC_H_