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/include/fxcrt | |
| 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/include/fxcrt')
| -rw-r--r-- | core/include/fxcrt/fx_arb.h | 3 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_basic.h | 6 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_stream.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/core/include/fxcrt/fx_arb.h b/core/include/fxcrt/fx_arb.h index ed0370ff74..a1dc231a8d 100644 --- a/core/include/fxcrt/fx_arb.h +++ b/core/include/fxcrt/fx_arb.h @@ -64,5 +64,8 @@ public: virtual FX_BOOL EndChar() = 0; virtual FX_INT32 GetBidiInfo(FX_INT32 &iStart, FX_INT32 &iCount) = 0; virtual void Reset() = 0; + +protected: + ~IFX_BidiChar() { } }; #endif diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h index 2a77e6e947..1c828cea48 100644 --- a/core/include/fxcrt/fx_basic.h +++ b/core/include/fxcrt/fx_basic.h @@ -240,7 +240,7 @@ class IFX_BufferArchive { public: IFX_BufferArchive(FX_STRSIZE size); - + virtual ~IFX_BufferArchive() { } virtual void Clear(); @@ -271,7 +271,7 @@ class CFX_FileBufferArchive : public IFX_BufferArchive, public CFX_Object { public: CFX_FileBufferArchive(FX_STRSIZE size = 32768); - ~CFX_FileBufferArchive(); + ~CFX_FileBufferArchive() override; virtual void Clear(); FX_BOOL AttachFile(IFX_StreamWrite *pFile, FX_BOOL bTakeover = FALSE); @@ -1377,7 +1377,7 @@ protected: class IFX_Pause { public: - + virtual ~IFX_Pause() { } virtual FX_BOOL NeedToPauseNow() = 0; }; class CFX_DataFilter : public CFX_Object diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index 0a3d1c4609..2e02f0c865 100644 --- a/core/include/fxcrt/fx_stream.h +++ b/core/include/fxcrt/fx_stream.h @@ -65,7 +65,7 @@ FX_BOOL FX_File_Move(FX_WSTR fileNameSrc, FX_WSTR fileNameDst); class IFX_StreamWrite { public: - + virtual ~IFX_StreamWrite() { } virtual void Release() = 0; virtual FX_BOOL WriteBlock(const void* pData, size_t size) = 0; @@ -91,6 +91,7 @@ IFX_FileWrite* FX_CreateFileWrite(FX_LPCWSTR filename); class IFX_StreamRead { public: + virtual ~IFX_StreamRead() { } virtual void Release() = 0; @@ -103,7 +104,6 @@ public: class IFX_FileRead : IFX_StreamRead { public: - virtual void Release() = 0; virtual FX_FILESIZE GetSize() = 0; |