From b9e0190938f62bf21df078e47190a62ba33ddab2 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 9 Jan 2015 10:46:50 -0800 Subject: Fix -Wnon-virtual-dtor compiler warnings. This is done by explicitly adding a virtual dtor to interface classes, since the cost is small given that there are already virtual functions. The exceptions are for classes that have a Release() or Delete() method, in which case it is non-virtual and protected to indicate that the virtual class is never the deletion point. BUG= R=brucedawson@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/810883005 --- core/src/fpdfdoc/tagged_int.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'core/src/fpdfdoc') diff --git a/core/src/fpdfdoc/tagged_int.h b/core/src/fpdfdoc/tagged_int.h index d190db6427..7efd682887 100644 --- a/core/src/fpdfdoc/tagged_int.h +++ b/core/src/fpdfdoc/tagged_int.h @@ -6,7 +6,9 @@ #ifndef _FPDF_TAGGED_INT_H_ #define _FPDF_TAGGED_INT_H_ -class CPDF_StructTreeImpl; + +#include "../../include/fpdfdoc/fpdf_tagged.h" + class CPDF_StructElementImpl; class CPDF_StructTreeImpl : public CPDF_StructTree { @@ -36,7 +38,6 @@ class CPDF_StructElementImpl FX_FINAL : public CPDF_StructElement { public: CPDF_StructElementImpl(CPDF_StructTreeImpl* pTree, CPDF_StructElementImpl* pParent, CPDF_Dictionary* pDict); - ~CPDF_StructElementImpl(); CPDF_StructTree* GetTree() const { return m_pTree; @@ -79,13 +80,15 @@ public: CPDF_StructElementImpl* Retain(); void Release(); protected: + ~CPDF_StructElementImpl(); + CPDF_StructTreeImpl* m_pTree; CFX_ByteString m_Type; CPDF_StructElementImpl* m_pParent; CPDF_Dictionary* m_pDict; CFX_ArrayTemplate m_Kids; - int m_RefCount; + friend class CPDF_StructTreeImpl; }; #endif -- cgit v1.2.3