[cfe-commits] r161656 - in /cfe/trunk: lib/StaticAnalyzer/Core/RegionStore.cpp tools/c-index-test/c-index-test.c

[Benjamin Kramer]

Author: d0k
Date: Fri Aug 10 05:06:13 2012
New Revision: 161656

URL: http://llvm.org/viewvc/llvm-project?rev=161656&view=rev
Log:
Fix a couple of pedantic gcc warnings.

Modified:
    cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
    cfe/trunk/tools/c-index-test/c-index-test.c

Modified: cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp?rev=161656&r1=161655&r2=161656&view=diff
==============================================================================
--- cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp (original)
+++ cfe/trunk/lib/StaticAnalyzer/Core/RegionStore.cpp Fri Aug 10 05:06:13 2012
@@ -56,7 +56,7 @@
     : P(r, k), Data(offset) {
     assert(r && "Must have known regions.");
     assert(getOffset() == offset && "Failed to store offset");
-    assert(r == r->getBaseRegion() || isa<ObjCIvarRegion>(r) && "Not a base");
+    assert((r == r->getBaseRegion() || isa<ObjCIvarRegion>(r)) && "Not a base");
   }
 public:
 

Modified: cfe/trunk/tools/c-index-test/c-index-test.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/c-index-test.c?rev=161656&r1=161655&r2=161656&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/c-index-test.c (original)
+++ cfe/trunk/tools/c-index-test/c-index-test.c Fri Aug 10 05:06:13 2012
@@ -3355,12 +3355,12 @@
 }
 
 int main(int argc, const char **argv) {
+  thread_info client_data;
+
 #ifdef CLANG_HAVE_LIBXML
   LIBXML_TEST_VERSION
 #endif
 
-  thread_info client_data;
-
   if (getenv("CINDEXTEST_NOTHREADS"))
     return cindextest_main(argc, argv);