diff options
| author | dsinclair <dsinclair@chromium.org> | 2016-04-27 12:26:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-27 12:26:01 -0700 |
| commit | 43854a5073602a4613131aa6dbac5f7b9a095bcd (patch) | |
| tree | 653ebf0cd690e13d1ca9e315ffeb34f8ac85cfbb /xfa/fgas/crt/fgas_utils.h | |
| parent | b2f6f9158f54cee1825830c7ed57fe9d89cff26e (diff) | |
| download | pdfium-43854a5073602a4613131aa6dbac5f7b9a095bcd.tar.xz | |
Standardize on ASSERT.
There are currently three ways to assert in the code (ASSERT, FXSYS_assert and
assert). This CL standardizes on ASSERT. The benefit of ASSERT is that it can
be overridden if the platform requies and we can pickup the Chromium version
if it has already been defined in the build.
This does change behaviour. Currently FXSYS_assert is always defined but ASSERT
is only defined in debug builds. So, the FXSYS_assert's would fire in Release
builds. That will no longer happen.
BUG=pdfium:219
Review-Url: https://codereview.chromium.org/1914303003
Diffstat (limited to 'xfa/fgas/crt/fgas_utils.h')
| -rw-r--r-- | xfa/fgas/crt/fgas_utils.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/xfa/fgas/crt/fgas_utils.h b/xfa/fgas/crt/fgas_utils.h index 5ebb32ff37..ebbcf4bd97 100644 --- a/xfa/fgas/crt/fgas_utils.h +++ b/xfa/fgas/crt/fgas_utils.h @@ -110,12 +110,12 @@ class CFX_ObjectBaseArrayTemplate : public CFX_BaseArray { int32_t Append(const CFX_ObjectBaseArrayTemplate& src, int32_t iStart = 0, int32_t iCount = -1) { - FXSYS_assert(GetBlockSize() == src.GetBlockSize()); + ASSERT(GetBlockSize() == src.GetBlockSize()); if (iCount == 0) { return 0; } int32_t iSize = src.GetSize(); - FXSYS_assert(iStart > -1 && iStart < iSize); + ASSERT(iStart > -1 && iStart < iSize); if (iCount < 0) { iCount = iSize; } @@ -139,12 +139,12 @@ class CFX_ObjectBaseArrayTemplate : public CFX_BaseArray { int32_t Copy(const CFX_ObjectBaseArrayTemplate& src, int32_t iStart = 0, int32_t iCount = -1) { - FXSYS_assert(GetBlockSize() == src.GetBlockSize()); + ASSERT(GetBlockSize() == src.GetBlockSize()); if (iCount == 0) { return 0; } int32_t iSize = src.GetSize(); - FXSYS_assert(iStart > -1 && iStart < iSize); + ASSERT(iStart > -1 && iStart < iSize); if (iCount < 0) { iCount = iSize; } @@ -312,7 +312,7 @@ class CFX_ObjectMassArrayTemplate : public CFX_BaseMassArray { return CFX_BaseMassArray::GetSize(); } int32_t iSize = src.GetSize(); - FXSYS_assert(iStart > -1 && iStart < iSize); + ASSERT(iStart > -1 && iStart < iSize); if (iCount < 0) { iCount = iSize; } @@ -332,7 +332,7 @@ class CFX_ObjectMassArrayTemplate : public CFX_BaseMassArray { return CFX_BaseMassArray::GetSize(); } int32_t iSize = src.GetSize(); - FXSYS_assert(iStart > -1 && iStart < iSize); + ASSERT(iStart > -1 && iStart < iSize); if (iCount < 0) { iCount = iSize; } @@ -479,7 +479,7 @@ class CFX_ObjectStackTemplate : public CFX_BaseStack { return CFX_BaseStack::GetSize(); } int32_t iSize = src.GetSize(); - FXSYS_assert(iStart > -1 && iStart < iSize); + ASSERT(iStart > -1 && iStart < iSize); if (iCount < 0) { iCount = iSize; } |