From 62120b79bbaca7430a8fc7ba0846b0a84f40542d Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Wed, 4 Feb 2015 10:37:17 -0800 Subject: Prevent base::CheckedNumeric from leaking outside of pdfium. Headers in /include directories should be free of implementation details from third_party. Put the types into a new header outside of /include. Requires https://codereview.chromium.org/902443003/ before a version containing this patch is rolled into chromium. R=jam@chromium.org Review URL: https://codereview.chromium.org/896023003 --- core/include/fxcrt/fx_stream.h | 1 - core/include/fxcrt/fx_system.h | 5 ----- 2 files changed, 6 deletions(-) (limited to 'core/include') diff --git a/core/include/fxcrt/fx_stream.h b/core/include/fxcrt/fx_stream.h index e54af579b6..b3784501a9 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_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_SAFE_DWORD; -typedef base::CheckedNumeric FX_SAFE_INT32; -typedef base::CheckedNumeric FX_SAFE_SIZE_T; - #if defined(__clang__) || _MSC_VER >= 1700 #define FX_FINAL final #define FX_OVERRIDE override -- cgit v1.2.3