Changes to work with Boost 1.53 and Thrust 1.7.