From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Mon, 13 Jan 2014 11:40:52 +0000 (-0700)
Subject: Bug 4002: clang 3.4 unable to compile
X-Git-Tag: SQUID_3_4_3~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e72fdbd1fbe75914fd86ac6401db887ff8699c9;p=thirdparty%2Fsquid.git

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 1a90f9b284..d37cc80273 100644
--- 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 66dabaf72a..d2d841a861 100644
--- 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);