Fix boost 1.55 compile errors

This gets boost 1.55 to compile on Mac OSX.
This is tested against 10.9 and Clang 5.1

The two patches are required when compiling with clang 5.1.
https://github.com/Homebrew/homebrew/commit/a20650deb61faa38356b370bcbaa
f35c195135b4