map: remove compare function
map: C/C++ mixing syntax clean up