re-enabled -Wconstant-logical-operand for clang 3.5 (nw)