From 0942d5af032a2e58bd455df6e8b585f245a43dc9 Mon Sep 17 00:00:00 2001
From: Aina Niemetz <aina.niemetz@gmail.com>
Date: Thu, 4 Mar 2021 10:49:28 -0800
Subject: [PATCH] Fix nightlies. (#6052)

---
 test/unit/util/binary_heap_black.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/unit/util/binary_heap_black.cpp b/test/unit/util/binary_heap_black.cpp
index d0838951c..e75a6e4ec 100644
--- a/test/unit/util/binary_heap_black.cpp
+++ b/test/unit/util/binary_heap_black.cpp
@@ -64,14 +64,14 @@ TEST_F(TestUtilBlackBinaryHeap, heap_series)
   ASSERT_DEATH(heap.top(), "!empty\\(\\)");
   ASSERT_DEATH(heap.pop(), "!empty\\(\\)");
 #endif
-  ASSERT_EQ(heap.begin(), heap.end());
+  ASSERT_TRUE(heap.begin() == heap.end());
 
   BinaryHeap<int32_t>::handle h5 = heap.push(5);
   ASSERT_TRUE(h5 == h5);
   ASSERT_EQ(heap.top(), 5);
   ASSERT_EQ(heap.size(), 1u);
   ASSERT_FALSE(heap.empty());
-  ASSERT_FALSE(heap.begin() == heap.end());
+  ASSERT_TRUE(heap.begin() != heap.end());
   ASSERT_EQ(*h5, 5);
   ASSERT_EQ(*heap.begin(), 5);
   ASSERT_NO_THROW(heap.erase(h5));
@@ -93,7 +93,7 @@ TEST_F(TestUtilBlackBinaryHeap, heap_series)
   ASSERT_NE(h3, h10);
   ASSERT_NE(h3, h2);
   ASSERT_NE(h10, h2);
-  ASSERT_NE(heap.begin(), heap.end());
+  ASSERT_TRUE(heap.begin() != heap.end());
   ASSERT_EQ(*heap.begin(), 10);
   ASSERT_EQ(*h2, 2);
   ASSERT_EQ(*h3, 3);
@@ -102,37 +102,37 @@ TEST_F(TestUtilBlackBinaryHeap, heap_series)
   ASSERT_EQ(heap.top(), 10);
   // test the iterator (note the order of elements isn't guaranteed!)
   BinaryHeap<int32_t>::const_iterator i = heap.begin();
-  ASSERT_NE(i, heap.end());
+  ASSERT_TRUE(i != heap.end());
   ASSERT_NO_THROW(*i++);
-  ASSERT_NE(i, heap.end());
+  ASSERT_TRUE(i != heap.end());
   ASSERT_NO_THROW(*i++);
-  ASSERT_NE(i, heap.end());
+  ASSERT_TRUE(i != heap.end());
   ASSERT_NO_THROW(*i++);
-  ASSERT_NE(i, heap.end());
+  ASSERT_TRUE(i != heap.end());
   ASSERT_NO_THROW(*i++);
-  ASSERT_EQ(i, heap.end());
+  ASSERT_TRUE(i == heap.end());
   ASSERT_FALSE(heap.empty());
   ASSERT_EQ(heap.size(), 4u);
   ASSERT_NO_THROW(heap.pop());
-  ASSERT_NE(heap.begin(), heap.end());
+  ASSERT_TRUE(i != heap.end());
   ASSERT_EQ(*heap.begin(), 5);
   ASSERT_EQ(heap.top(), 5);
   ASSERT_FALSE(heap.empty());
   ASSERT_EQ(heap.size(), 3u);
   ASSERT_NO_THROW(heap.pop());
-  ASSERT_NE(heap.begin(), heap.end());
+  ASSERT_TRUE(heap.begin() != heap.end());
   ASSERT_EQ(*heap.begin(), 3);
   ASSERT_EQ(heap.top(), 3);
   ASSERT_FALSE(heap.empty());
   ASSERT_EQ(heap.size(), 2u);
   ASSERT_NO_THROW(heap.pop());
-  ASSERT_NE(heap.begin(), heap.end());
+  ASSERT_TRUE(heap.begin() != heap.end());
   ASSERT_EQ(*heap.begin(), 2);
   ASSERT_EQ(heap.top(), 2);
   ASSERT_FALSE(heap.empty());
   ASSERT_EQ(heap.size(), 1u);
   ASSERT_NO_THROW(heap.pop());
-  ASSERT_EQ(heap.begin(), heap.end());
+  ASSERT_TRUE(heap.begin() == heap.end());
   ASSERT_TRUE(heap.empty());
   ASSERT_EQ(heap.size(), 0u);
 #ifdef CVC4_ASSERTIONS
-- 
2.30.2