Compilation errors with boost 1.56

Not sure this makes sense to merge to master right now (is boost 1.56 compatibility something that is desirable?) -- but this is what it took to get it to compile on my machine (with Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn)) and pass `make check`.