From 5aeaedf963f312b69c14d88cad3f355d68f610b4 Mon Sep 17 00:00:00 2001
From: "Corey J. Nolet" <cjnolet@gmail.com>
Date: Tue, 6 Jun 2023 13:06:25 -0400
Subject: [PATCH 1/2] Fixing merge_labels test

---
 cpp/test/label/merge_labels.cu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/test/label/merge_labels.cu b/cpp/test/label/merge_labels.cu
index 022581c655..db28e5cf45 100644
--- a/cpp/test/label/merge_labels.cu
+++ b/cpp/test/label/merge_labels.cu
@@ -75,7 +75,8 @@ class MergeLabelsTest : public ::testing::TestWithParam<MergeLabelsInputs<Index_
 
   MergeLabelsInputs<Index_> params;
   rmm::device_uvector<Index_> labels_a, labels_b, expected, R;
-  rmm::device_scalar<bool> mask, m;
+  rmm::device_uvector<bool> mask;
+    rmm::device_scalar<bool> m;
 };
 
 using MergeLabelsTestI = MergeLabelsTest<int>;

From b7c34c3bdf06e730740d59da13279c10dcfdb7c8 Mon Sep 17 00:00:00 2001
From: "Corey J. Nolet" <cjnolet@gmail.com>
Date: Tue, 6 Jun 2023 13:13:53 -0400
Subject: [PATCH 2/2] Fixing style

---
 cpp/test/label/merge_labels.cu | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cpp/test/label/merge_labels.cu b/cpp/test/label/merge_labels.cu
index db28e5cf45..3e12f9171e 100644
--- a/cpp/test/label/merge_labels.cu
+++ b/cpp/test/label/merge_labels.cu
@@ -76,7 +76,8 @@ class MergeLabelsTest : public ::testing::TestWithParam<MergeLabelsInputs<Index_
   MergeLabelsInputs<Index_> params;
   rmm::device_uvector<Index_> labels_a, labels_b, expected, R;
   rmm::device_uvector<bool> mask;
-    rmm::device_scalar<bool> m;
+
+  rmm::device_scalar<bool> m;
 };
 
 using MergeLabelsTestI = MergeLabelsTest<int>;