summaryrefslogtreecommitdiff
path: root/xfa/fxfa
diff options
context:
space:
mode:
authorweili <weili@chromium.org>2016-05-04 18:25:27 -0700
committerCommit bot <commit-bot@chromium.org>2016-05-04 18:25:27 -0700
commit6e1ae8614e7c81d8e6a6249ee73cfbf8abb0d099 (patch)
tree851d0ee896934ef0269e09db28b05f7f300c54cb /xfa/fxfa
parentc777f486f84611d2fdd2d03af661b14955f9efb6 (diff)
downloadpdfium-6e1ae8614e7c81d8e6a6249ee73cfbf8abb0d099.tar.xz
Enable 'treating warnings as errors' for 64 bit Win builds
The reason to disable 'treating warnings as errors' earilier is due to c4267 warnings, which we already disabled uniformly in pdfium.gyp. Re-enable this now so that we can have the same level of compilation warnings/errors on 32 bit and 64 bit builds. Also fix two c4390 warnings on Windows release builds. Their warning messages are "empty controlled statement found; is this the intent?" Review-Url: https://codereview.chromium.org/1949303002
Diffstat (limited to 'xfa/fxfa')
-rw-r--r--xfa/fxfa/parser/xfa_object_imp.cpp9
1 files changed, 3 insertions, 6 deletions
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;