diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-02-04 10:48:28 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-02-04 10:48:28 -0800 |
| commit | 53476d6956781ceb252e1ae5e01f83a48bcb4908 (patch) | |
| tree | 9310dbde273217a0de7e5165c585b081b046bf1c /core/include/fxcrt | |
| parent | d2501393eb0c18b5e73506658cd8e8ae0c4ea456 (diff) | |
| download | pdfium-53476d6956781ceb252e1ae5e01f83a48bcb4908.tar.xz | |
Merge to XFA: Prevent base::CheckedNumeric from leaking outside of pdfium.
Original review URL: https://codereview.chromium.org/896023003
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/897023005
Diffstat (limited to 'core/include/fxcrt')
| -rw-r--r-- | core/include/fxcrt/fx_stream.h | 1 | ||||
| -rw-r--r-- | core/include/fxcrt/fx_system.h | 5 |
2 files changed, 0 insertions, 6 deletions
diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index 2e02f0c865..ff8344dd68 100644 --- a/core/include/fxcrt/fx_stream.h +++ b/core/include/fxcrt/fx_stream.h @@ -30,7 +30,6 @@ FX_DEFINEHANDLE(FX_HFILE) #endif #define FX_FILESIZE off_t #endif -typedef base::CheckedNumeric<FX_FILESIZE> FX_SAFE_FILESIZE; #define FX_GETBYTEOFFSET32(a) 0 #define FX_GETBYTEOFFSET40(a) 0 #define FX_GETBYTEOFFSET48(a) 0 diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h index 355bd74327..b31a60396b 100644 --- a/core/include/fxcrt/fx_system.h +++ b/core/include/fxcrt/fx_system.h @@ -276,11 +276,6 @@ int FXSYS_round(FX_FLOAT f); #ifdef __cplusplus }; -#include "../../../third_party/numerics/safe_math.h" -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 |