000310: only ALIGN_C++ is updated -> C++ ANSI conforming + minor bug correction