Backport “Fix: OSX QT compile: use built-in swap if available, or defer” #9660

Macs with Protobuf 3 can’t compile the 0.13 branch. Backport the fix from master.

Please amend the commit with the source commit and set the author to the original one. E.g. c365556185d89122a04344d2dc640cffc67f155c

Thanks. Will do.

Thanks, backported via 59c37ae

Thanks, @laanwj.

Question for future reference: I have a microscopic nit with the backport as committed. It's something I fixed in my PR but (probably) isn't worth fixing in 0.13. If I want to use the source commit, as @MarcoFalke requested, and also make changes, should I leave my changes as a separate commit or should I do a fixup? Thanks.

Backports are usually not the time to fix problems or make changes.

But if you need to make some larger change to get it to work with the previous branch, yes just add your own commit. Just be sure to add the metadata (Github-Pull: , Rebased-From: ) on the cherry-picked commit.

I have a microscopic nit with the backport as committed.

Yes, agree with laanwj, backports are for bug fixes only and don't change backport commits unless it is required due to merge conflicts.

On Thu, Feb 2, 2017 at 9:01 AM, Wladimir J. van der Laan < notifications@github.com> wrote:

Backports are usually not the time to fix problems or make changes.

But if you need to make some larger change to get it to work with the previous branch, yes just add your own commit. Just be sure to add the metadata (Github-Pull: , Rebased-From: ) on the cherry-picked commit.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/bitcoin/bitcoin/pull/9660#issuecomment-276891688, or mute the thread https://github.com/notifications/unsubscribe-auth/AGGmv7HS137nyIJaxc3DX2nTmxqE8IQkks5rYY1igaJpZM4LzWFx .