commit 6e1ae8614e7c81d8e6a6249ee73cfbf8abb0d099
author weili <weili@chromium.org> Wed May 04 18:25:27 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed May 04 18:25:27 2016 -0700
tree 851d0ee896934ef0269e09db28b05f7f300c54cb
parent c777f486f84611d2fdd2d03af661b14955f9efb6

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

build_gyp/standalone.gypi

diff --git a/build_gyp/standalone.gypi b/build_gyp/standalone.gypi
index 67ed204..be18b50 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.

xfa/fxfa/parser/xfa_object_imp.cpp

diff --git a/xfa/fxfa/parser/xfa_object_imp.cpp b/xfa/fxfa/parser/xfa_object_imp.cpp
index 6b43838..32da7f7 100644
--- a/xfa/fxfa/parser/xfa_object_imp.cpp
+++ b/xfa/fxfa/parser/xfa_object_imp.cpp
@@ -4574,9 +4574,7 @@
 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 @@
   }
   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;