Use different unused variable warning suppressor for GCC.
Merge pull request #2193 from ey6es/master

Use different unused variable warning suppressor for GCC.
Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup