std::binary_function and std::unary_function are deprecated in C++11
and removed in C++17. Remove all usage.

Change-Id: I6c40605838f60c3b6cc5f461f58134a330e0aab9