For r181148: fixed warning 'enumeral and non-enumeral type in conditional expression'.