AutoPtr class became a sub-class of unique_ptr with some special magic to mimic behavior of auto_ptr for copy constructor. The code was already there, but for some reason visual studio did not set __cplusplus correctly for some reason. The other change is remove of binary function usage, which is not needed in the Freestyle code.