Add parentheses to silence clang warning

crrev.com/1887033002 introuced a clang warning (see below).
This fixes it, so that breakpad can be rolled in chrome, where
warnings are always fatal.

From: https://build.chromium.org/p/tryserver.chromium.android/builders/android_chromium_gn_compile_dbg/builds/59031/steps/compile%20%28with%20patch%29/logs/stdio

FAILED: clang_x64/obj/breakpad/dump_syms/dwarf_cu_to_module.o
../../breakpad/src/common/dwarf_cu_to_module.cc:420:20: error: '&&' within '||' [-Werror,-Wlogical-op-parentheses]
if (declaration_ && qualified_name || (unqualified_name && enclosing_name)) {
~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~ ~~
../../breakpad/src/common/dwarf_cu_to_module.cc:420:20: note: place parentheses around the '&&' expression to silence this warning
if (declaration_ && qualified_name || (unqualified_name && enclosing_name)) {
                 ^
   (                             )

R=mark@chromium.org, petrcermak@chromium.org

Review URL: https://codereview.chromium.org/1928363002 .
This commit is contained in:
Primiano Tucci 2016-05-03 16:56:06 +02:00
parent 17ad0c18b1
commit fcb844ee32

View file

@ -417,7 +417,8 @@ string DwarfCUToModule::GenericDIEHandler::ComputeQualifiedName() {
// If this DIE was marked as a declaration, record its names in the // If this DIE was marked as a declaration, record its names in the
// specification table. // specification table.
if (declaration_ && qualified_name || (unqualified_name && enclosing_name)) { if ((declaration_ && qualified_name) ||
(unqualified_name && enclosing_name)) {
Specification spec; Specification spec;
if (qualified_name) { if (qualified_name) {
spec.qualified_name = *qualified_name; spec.qualified_name = *qualified_name;