Fixed compiler warning about comparison between signed/unsigned on row 247.
Suppress compiler warnings due to GCC bug 34734.
Suppress compiler warnings due to GCC bug 34734.
Fixed a syntax error.
Fixed merge conflict.