Tristan Barback authored Jul 30, 2018 and Martin Marinov committed Jul 30, 2018

* Add new warning guard macro for CQI: add a completely new macro rather than using
   the existing one as this will let us customise the behaviour without
   breaking any of the existing warning suppressions. In particular the
   warning level can be set to 3 even for the problem header files.

* Add unused variable macro.

* Minor whitespace correction