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/fxfa/parser/xfa_script_resolveprocessor.cpp | |
| 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/fxfa/parser/xfa_script_resolveprocessor.cpp')
| -rw-r--r-- | xfa/fxfa/parser/xfa_script_resolveprocessor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp index fcd24bf949..6ea1a331c1 100644 --- a/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp +++ b/xfa/fxfa/parser/xfa_script_resolveprocessor.cpp @@ -522,7 +522,7 @@ int32_t CXFA_ResolveProcessor::XFA_ResolveNodes_GetFilter( const CFX_WideStringC& wsExpression, int32_t nStart, CXFA_ResolveNodesData& rnd) { - FXSYS_assert(nStart > -1); + ASSERT(nStart > -1); int32_t iLength = wsExpression.GetLength(); if (nStart >= iLength) { return 0; @@ -691,7 +691,7 @@ void CXFA_ResolveProcessor::XFA_ResolveNode_DoPredicateFilter( int32_t iFoundCount, CXFA_ResolveNodesData& rnd) { CXFA_NodeArray& findNodes = (CXFA_NodeArray&)rnd.m_Nodes; - FXSYS_assert(iFoundCount == findNodes.GetSize()); + ASSERT(iFoundCount == findNodes.GetSize()); CFX_WideString wsExpression; XFA_SCRIPTLANGTYPE eLangType = XFA_SCRIPTLANGTYPE_Unkown; if (wsCondition.Left(2) == FX_WSTRC(L".[") && |