Fixed a clang warning (from Travis) and replaced a MACRO by a anonym namespace