silence icc warning about undefined __cplusplus

This is the inverse of the optimization mentioned at
http://gcc.gnu.org/onlinedocs/cpp/Defined.html#Defined
Add newline at end of file to make g++ happy
fix type of counter to match length