Merge lp:~alan-griffiths/mir/fix-1475994-g++-5 into lp:mir
Proposed by
Alan Griffiths
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Alan Griffiths | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 2764 | ||||
Proposed branch: | lp:~alan-griffiths/mir/fix-1475994-g++-5 | ||||
Merge into: | lp:mir | ||||
Diff against target: |
193 lines (+15/-70) 7 files modified
examples/basic.c (+2/-2) examples/flicker.c (+2/-2) src/client/rpc/mir_protobuf_rpc_channel.cpp (+0/-1) src/include/common/mir/protobuf/google_protobuf_guard.h (+0/-40) src/protobuf/google_protobuf_guard.cpp (+9/-22) src/server/frontend/protobuf_connection_creator.cpp (+0/-1) tests/unit-tests/android_input/property_map.cpp (+2/-2) |
||||
To merge this branch: | bzr merge lp:~alan-griffiths/mir/fix-1475994-g++-5 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Approve | |
Kevin DuBois (community) | Approve | ||
Daniel van Vugt | Approve | ||
Andreas Pokorny (community) | Approve | ||
Review via email: mp+265279@code.launchpad.net |
Commit message
Rework code that didn't compile with gcc-5.0
Description of the change
Rework code that didn't compile with gcc-5.0
To post a comment you must log in.
Hmm I believe .good() tests more.. I think static_cast<bool> would do too - but the extra check for eof should not matter.
We could also use __func__ which ould be closer to __FRETTY_FUNCTION__ or __FUNCTION__.