In checkOpenGLError and checkIceTError, there was a macro that defined
an if statement that returned from a function.  This messed up the code
metric software tau, which missed this return from the function.  Instead
use the macro to define a case for a switch statement.