Updated for boost 1.55