Bug 4002: clang 3.4 unable to compile

part 3: Fix coding ambiguity in store_repl_heap.cc and heap.h

diff --git a/include/heap.h b/include/heap.h
index 1a90f9b284c409b6b2704d209d8f2e30c8a1a17b..d37cc80273a73b9932cf1858382c621e59d8aa52 100644 (file)
--- a/include/heap.h
+++ b/include/heap.h
@@ -158,7 +158,7 @@ SQUIDCEXTERN int heap_empty(heap *);
 SQUIDCEXTERN int heap_nodes(heap *);
 #else /* MACRO_DEBUG */
 #define        heap_nodes(heap)        ((heap)->last)
-#define        heap_empty(heap)        (((heap)->last <= 0) ? 1 : 0)
+#define        heap_empty(heap)        ((heap)->last <= 0 ? 1 : 0)
 #endif /* MACRO_DEBUG */
 
 /*

diff --git a/src/repl/heap/store_repl_heap.cc b/src/repl/heap/store_repl_heap.cc
index 66dabaf72aff86622502d0173f431182f0e3518b..d2d841a861af81be0124e90eb5f5c8a46cb65915 100644 (file)
--- a/src/repl/heap/store_repl_heap.cc
+++ b/src/repl/heap/store_repl_heap.cc
@@ -221,7 +221,7 @@ heap_purgeNext(RemovalPurgeWalker * walker)
 
 try_again:
 
-    if (!heap_nodes(h->theHeap) > 0)
+    if (heap_empty(h->theHeap))
         return NULL;           /* done */
 
     age = heap_peepminkey(h->theHeap);