Fixed warnings for 'pedantic' option.

Updated code to compile without warning under 'pedantic' mode.