From 6b82c1ab77a6ccb8cd045e0a53cb0727fce3e76b Mon Sep 17 00:00:00 2001
From: Petar Hristov <mm16pgh@leeds.ac.uk>
Date: Mon, 27 Jul 2020 10:00:11 +0100
Subject: [PATCH] Fixed CUDA build errors.

---
 vtkm/worklet/contourtree_augmented/Types.h                     | 2 ++
 .../processcontourtree/HypersweepWorklets.h                    | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/vtkm/worklet/contourtree_augmented/Types.h b/vtkm/worklet/contourtree_augmented/Types.h
index 37ebfb46f..65435ed92 100644
--- a/vtkm/worklet/contourtree_augmented/Types.h
+++ b/vtkm/worklet/contourtree_augmented/Types.h
@@ -162,6 +162,7 @@ public:
   bool UpEdge;
   Float64 SubtreeHeight;
 
+  VTKM_EXEC
   bool operator<(const EdgeDataHeight& b) const
   {
     if (this->I == b.I)
@@ -206,6 +207,7 @@ public:
   bool UpEdge;
   Id SubtreeVolume;
 
+  VTKM_EXEC
   bool operator<(const EdgeDataVolume& b) const
   {
     if (this->I == b.I)
diff --git a/vtkm/worklet/contourtree_augmented/processcontourtree/HypersweepWorklets.h b/vtkm/worklet/contourtree_augmented/processcontourtree/HypersweepWorklets.h
index 0aba0f372..59c670431 100644
--- a/vtkm/worklet/contourtree_augmented/processcontourtree/HypersweepWorklets.h
+++ b/vtkm/worklet/contourtree_augmented/processcontourtree/HypersweepWorklets.h
@@ -667,7 +667,8 @@ public:
     }
     else
     {
-      chainToBranchPortal.Set(supernode, NO_SUCH_ELEMENT);
+      // This should just be vtkm::worklet::contourtree_augmented::NO_SUCH_ELEMENT, but there's the build error - identifier "vtkm::worklet::contourtree_augmented::NO_SUCH_ELEMENT" is undefined in device code
+      chainToBranchPortal.Set(supernode, std::numeric_limits<vtkm::Id>::min());
     }
   }
 }; // ComputeMinMaxValues