diff options
author | Tom Sepez <tsepez@chromium.org> | 2015-01-09 11:46:17 -0800 |
---|---|---|
committer | Tom Sepez <tsepez@chromium.org> | 2015-01-09 11:46:17 -0800 |
commit | e5b59cacbb7ed6bcefe25d736a315753dd764594 (patch) | |
tree | 973eb3e80739558ba3c06f8b06358bfb1c79581c /core/src/fpdfdoc | |
parent | 1c83be6bedb4dceb06ef7e8e6a5d76105d0fff4d (diff) | |
download | pdfium-e5b59cacbb7ed6bcefe25d736a315753dd764594.tar.xz |
merge to XFA: Fix -Wnon-virtual-dtor compiler warnings.
Original at URL: https://codereview.chromium.org/810883005
Note that the new code in XFA introduces many more of these, to be handled
separately.
TBR=brucedawson@chromium.org
TBR=thestig@chromium.org
BUG=https://code.google.com/p/pdfium/issues/detail?id=102
Review URL: https://codereview.chromium.org/842223004
Diffstat (limited to 'core/src/fpdfdoc')
-rw-r--r-- | core/src/fpdfdoc/tagged_int.h | 9 |
1 files changed, 6 insertions, 3 deletions
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<CPDF_StructKid> m_Kids; - int m_RefCount; + friend class CPDF_StructTreeImpl; }; #endif |