- fixed some "enumerated type mixed with another type" warnings on icc