diff options
| author | Tom Sepez <tsepez@chromium.org> | 2014-08-13 17:12:28 -0700 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2014-08-13 17:12:28 -0700 |
| commit | 368ed462dd6e5e63977ca2b2e56a7e83b3a3bdda (patch) | |
| tree | d6e9f37c824646a245d2753fe93a8404da52dbff /core/include/fxcrt | |
| parent | 2fd7b0be4473f4c9877fed2c2ade403c71ded395 (diff) | |
| download | pdfium-368ed462dd6e5e63977ca2b2e56a7e83b3a3bdda.tar.xz | |
Add FX_OVERRIDE and use it for virtual functions of FX_FINAL classes.
Should there be cases where this fails to compile, it indicates a mistake,
either an incorrectly declared overrriden virtual method, or a method that
should be declared non-virtual.
The only issues were with CPDF_CustomAccess::GetBlock(), CPDF_CustomAccess::GetByte(),
and CPDF_CustomAccess::GetFullPath(). These don't appear to be used anywhere,
and are removed. Two members are removed that are no longer needed once those
methods are removed.
R=jam@chromium.org, jun_fang@foxitsoftware.com
Review URL: https://codereview.chromium.org/454983003
Diffstat (limited to 'core/include/fxcrt')
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 6d659e2c10..36050f35dc 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -280,13 +280,17 @@ int FXSYS_round(FX_FLOAT f); typedef base::CheckedNumeric<FX_DWORD> FX_SAFE_DWORD; typedef base::CheckedNumeric<FX_INT32> FX_SAFE_INT32; typedef base::CheckedNumeric<size_t> FX_SAFE_SIZE_T; + #if defined(__clang__) || _MSC_VER >= 1700 #define FX_FINAL final +#define FX_OVERRIDE override #elif defined(__GNUC__) && __cplusplus >= 201103 && \ (__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40700 #define FX_FINAL final +#define FX_OVERRIDE override #else #define FX_FINAL +#define FX_OVERRIDE #endif #endif #endif |