diff options
| -rw-r--r-- | build_gyp/standalone.gypi | 8 | ||||
| -rw-r--r-- | xfa/fxfa/parser/xfa_object_imp.cpp | 9 |
2 files changed, 4 insertions, 13 deletions
diff --git a/build_gyp/standalone.gypi b/build_gyp/standalone.gypi index 67ed204409..be18b5006c 100644 --- a/build_gyp/standalone.gypi +++ b/build_gyp/standalone.gypi @@ -300,6 +300,7 @@ 'EnableFunctionLevelLinking': 'true', 'RuntimeTypeInfo': 'false', 'WarningLevel': '3', + 'WarnAsError': 'true', 'DebugInformationFormat': '3', 'Detect64BitPortabilityProblems': 'false', 'conditions': [ @@ -311,13 +312,6 @@ }, { 'ExceptionHandling': '0', }], - ['target_arch=="x64"', { - # 64-bit warnings need to be resolved. - # https://code.google.com/p/pdfium/issues/detail?id=101 - 'WarnAsError': 'false', - }, { - 'WarnAsError': 'true', - }], ['clang==1', { 'AdditionalOptions': [ # Don't warn about unused function parameters. diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp index 6b438387be..32da7f7a17 100644 --- a/xfa/fxfa/parser/xfa_object_imp.cpp +++ b/xfa/fxfa/parser/xfa_object_imp.cpp @@ -4574,9 +4574,7 @@ CXFA_Node* CXFA_Node::GetChild(int32_t index, int32_t CXFA_Node::InsertChild(int32_t index, CXFA_Node* pNode) { ASSERT(!pNode->m_pNext); pNode->m_pParent = this; - FX_BOOL bWasPurgeNode = m_pDocument->RemovePurgeNode(pNode); - if (!bWasPurgeNode) - ASSERT(false); + ASSERT(m_pDocument->RemovePurgeNode(pNode)); if (m_pChild == NULL || index == 0) { if (index > 0) { @@ -4617,15 +4615,14 @@ int32_t CXFA_Node::InsertChild(int32_t index, CXFA_Node* pNode) { } return index; } + FX_BOOL CXFA_Node::InsertChild(CXFA_Node* pNode, CXFA_Node* pBeforeNode) { if (!pNode || pNode->m_pParent || (pBeforeNode && pBeforeNode->m_pParent != this)) { ASSERT(false); return FALSE; } - FX_BOOL bWasPurgeNode = m_pDocument->RemovePurgeNode(pNode); - if (!bWasPurgeNode) - ASSERT(false); + ASSERT(m_pDocument->RemovePurgeNode(pNode)); int32_t nIndex = -1; pNode->m_pParent = this; |