mirror of
https://gitlab.com/apparmor/apparmor.git
synced 2025-03-04 08:24:42 +01:00
parser: fix more gcc 5 compilation problems
Merge from trunk revision 2871 Don't pass an ostream reference into another ostream via <<. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Seth Arnold <seth.arnold@canonical.com>
This commit is contained in:
parent
f45628d749
commit
9ed8789918
1 changed files with 7 additions and 4 deletions
|
@ -148,11 +148,14 @@ ostream &af_rule::dump_peer(ostream &os)
|
|||
|
||||
ostream &af_rule::dump(ostream &os)
|
||||
{
|
||||
os << dump_prefix(os);
|
||||
dump_prefix(os);
|
||||
os << af_name;
|
||||
os << dump_local(os);
|
||||
if (has_peer_conds())
|
||||
os << " peer=(" << dump_peer(os) << ")";
|
||||
dump_local(os);
|
||||
if (has_peer_conds()) {
|
||||
os << " peer=(";
|
||||
dump_peer(os);
|
||||
os << ")";
|
||||
}
|
||||
os << ",\n";
|
||||
|
||||
return os;
|
||||
|
|
Loading…
Add table
Reference in a new issue