summaryrefslogtreecommitdiff
path: root/src/utilcode/rangetree.cpp
diff options
context:
space:
mode:
authorJan Vorlicek <janvorli@microsoft.com>2015-03-27 23:30:10 +0100
committerJan Vorlicek <janvorli@microsoft.com>2015-04-01 21:39:28 +0200
commitde8b85b643ac08d69696ad078846424b69ae651f (patch)
tree3c8f416945ebb2768eeb1f26a5d09b5f4dcb2202 /src/utilcode/rangetree.cpp
parent898cdcf05ae334252b354a1f5bae9e26be1912ec (diff)
downloadcoreclr-de8b85b643ac08d69696ad078846424b69ae651f.tar.gz
coreclr-de8b85b643ac08d69696ad078846424b69ae651f.tar.bz2
coreclr-de8b85b643ac08d69696ad078846424b69ae651f.zip
Fix next round of warning types
This change fixes the following warnings: 1) Assignment in a condition should be wrapped in () 2) Priority of && / || should be indicated by parentheses. 3) Unknown #pragma optimize ifdefed out for non MSVC 4) Unused functions deleted or put under #ifdef 5) Extra tokens warning disabling moved to the CMakeLists.txt in the src/inc 6) Self assignment of a member or local variable 7) Assigning ~0 to a bitfield member that was just 8 bit wide It also fixes a bug in the STRESS_LOGxx macro invocation in exceptionhandling.cpp and stackwalk.cpp related to recent adding the DBG_ADDR macro usage. This macro expanded a single parameter into two expressions to extract high / low 32 bits separately. But the STRESS_LOGxx parameters are passed to the StressLog::LogMsg method as follows: (void*)(size_t)(data1) That means that the expanded pair x, y would be inserted as data 1 and that leads to ignoring the x due to the comma operator.
Diffstat (limited to 'src/utilcode/rangetree.cpp')
-rw-r--r--src/utilcode/rangetree.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utilcode/rangetree.cpp b/src/utilcode/rangetree.cpp
index 028ebd9769..6d3f644471 100644
--- a/src/utilcode/rangetree.cpp
+++ b/src/utilcode/rangetree.cpp
@@ -357,8 +357,8 @@ BOOL RangeTree::OverlapsNode(Node *node, SIZE_T start, SIZE_T end, SIZE_T mask)
&& (end > node->start && start < node->end))
return TRUE;
- if (node->children[0] != NULL && OverlapsNode(node->children[0], start, end, mask)
- || node->children[1] != NULL && OverlapsNode(node->children[1], start, end, mask))
+ if ((node->children[0] != NULL && OverlapsNode(node->children[0], start, end, mask))
+ || (node->children[1] != NULL && OverlapsNode(node->children[1], start, end, mask)))
return TRUE;
return FALSE;