From ad24a3cb96810d8d41c40608048fa08bda94e89f Mon Sep 17 00:00:00 2001 From: TimePath Date: Sun, 6 Aug 2017 18:46:18 +1000 Subject: [PATCH] Remove -Wno-parentheses --- CMakeLists.txt | 1 - libs/splines/math_quaternion.h | 2 +- plugins/vfspk3/vfs.cpp | 4 ++-- radiant/brush_primit.cpp | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db0a1cae..6d801b7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,6 @@ addflags("-Wall") addflags("-Wextra") addflags("-pedantic") -addflags("-Wno-parentheses") addflags("-Wno-sign-compare") addflags("-Wno-write-strings") addflags("-Wno-unused-function") diff --git a/libs/splines/math_quaternion.h b/libs/splines/math_quaternion.h index 8632661d..b33f4425 100644 --- a/libs/splines/math_quaternion.h +++ b/libs/splines/math_quaternion.h @@ -157,7 +157,7 @@ inline int operator==( quat_t a, quat_t b ) { } inline int operator!=( quat_t a, quat_t b ) { - return ( ( a.x != b.x ) || ( a.y != b.y ) || ( a.z != b.z ) && ( a.w != b.w ) ); + return ( ( a.x != b.x ) || ( a.y != b.y ) || (( a.z != b.z ) && ( a.w != b.w )) ); } inline float quat_t::Length( void ) { diff --git a/plugins/vfspk3/vfs.cpp b/plugins/vfspk3/vfs.cpp index 23805ebc..b98a19ce 100644 --- a/plugins/vfspk3/vfs.cpp +++ b/plugins/vfspk3/vfs.cpp @@ -683,8 +683,8 @@ int GetFileCount( const char *filename, int flag ){ for ( archives_t::iterator i = g_archives.begin(); i != g_archives.end(); ++i ) { - if ( ( *i ).is_pakfile && ( flag & VFS_SEARCH_PAK ) != 0 - || !( *i ).is_pakfile && ( flag & VFS_SEARCH_DIR ) != 0 ) { + if ( (( *i ).is_pakfile && ( flag & VFS_SEARCH_PAK ) != 0) + || (!( *i ).is_pakfile && ( flag & VFS_SEARCH_DIR ) != 0) ) { if ( ( *i ).archive->containsFile( fixed ) ) { ++count; } diff --git a/radiant/brush_primit.cpp b/radiant/brush_primit.cpp index 4ea73c03..b4dab4d0 100644 --- a/radiant/brush_primit.cpp +++ b/radiant/brush_primit.cpp @@ -1235,7 +1235,7 @@ inline Matrix4 matrix4_reflection_for_plane45( const Plane3& plane, const Vector Vector3 first = from; Vector3 second = to; - if ( vector3_dot( from, plane.normal() ) > 0 == vector3_dot( to, plane.normal() ) > 0 ) { + if ( (vector3_dot( from, plane.normal() ) > 0) == (vector3_dot( to, plane.normal() ) > 0) ) { first = vector3_negated( first ); second = vector3_negated( second ); } -- 2.39.2