[apparmor] gcc 5 errors

[John Johansen]

On 02/12/2015 12:40 PM, Seth Arnold wrote:
> Doko has conducted a gcc5 rebuild of the Ubuntu archive and AppArmor has
> failed:
> http://people.ubuntuwire.org/~wgrant/rebuild-ftbfs-test/test-rebuild-20150202-gcc5-vivid.html
> 
> It looks like all the errors reported boil down to one real problem:
> 
> g++ -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wall -Wsign-compare -Wmissing-field-initializers -Wformat-security -Wunused-parameter -std=gnu++0x -D_GNU_SOURCE  -DPACKAGE=\"apparmor-parser\" -DLOCALEDIR=\"/usr/share/locale\" -DSUBDOMAIN_CONFDIR=\"/etc/apparmor\" -I../libraries/libapparmor//include -c -o dbus.o dbus.cc
> dbus.cc: In member function 'virtual std::ostream& dbus_rule::dump(std::ostream&)':
> dbus.cc:152:32: error: no match for 'operator<<' (operand types are 'std::basic_ostream<char>' and 'std::ostream {aka std::basic_ostream<char>}')
>    os << " member=\"" << member << os << "\"";
>                                 ^
So that shouldn't be there, probably was two separate lines that got pulled
into one, but I don't see why it should fail either.

> 
> I'm surprised to see the '<< os <<' here; I don't know what was intended
> to happen here, but removing it with the following patch didn't introduce
> any new build errors or warnings on the gcc-4.8 on vivid.
> 
> (I don't have an easy way to test the build with gcc-5, so this may not be
> exhaustive.)
> 
the patch is fine and we should run with it in the 2.8 and 2.9 branches as
well.

Acked-by: John Johansen <john.johansen at canonical.com>