Added C++ guards to util_angle