forked from pool/oprofile
31 lines
769 B
Diff
31 lines
769 B
Diff
|
From: William Cohen <wcohen@redhat.com>
|
||
|
|
Subject: Fix FTBFS problem with GCC-6
|
||
|
|
Date: 2016-02-05
|
||
|
|
References: boo#985359
|
||
|
|
Upstream: yes
|
||
|
|
|
||
|
|
GCC-6 is pickier about some of the type conversions.
|
||
|
|
Avoid the intermediate bool type to make GCC-6 happy.
|
||
|
|
|
||
|
|
Index: b/libutil++/op_bfd.cpp
|
||
|
|
===================================================================
|
||
|
|
--- a/libutil++/op_bfd.cpp
|
||
|
|
+++ b/libutil++/op_bfd.cpp
|
||
|
|
@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_ind
|
||
|
|
{
|
||
|
|
op_bfd_symbol const & sym = syms[sym_idx];
|
||
|
|
|
||
|
|
- bool const verbose = cverb << (vbfd & vlevel1);
|
||
|
|
-
|
||
|
|
if (anon_obj)
|
||
|
|
start = sym.vma();
|
||
|
|
else
|
||
|
|
start = sym.filepos();
|
||
|
|
end = start + sym.size();
|
||
|
|
|
||
|
|
- if (!verbose)
|
||
|
|
+ if (!(cverb << (vbfd & vlevel1)))
|
||
|
|
return;
|
||
|
|
|
||
|
|
io_state state(cverb << (vbfd & vlevel1));
|