Fix compile error -Werror=logical-op for g++ 6.x.x
Fix compile error -Werror=logical-op for g++ 6.x.x

Add workaround for compile error for equivalent
logical expressions

See the discussion of the bug here.
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69602#c16

sociomantic/libdrizzle-redux,sociomantic/libdrizzle-redux,sociomantic/libdrizzle-redux