Commit 1751b493 authored by Allison Vacanti's avatar Allison Vacanti

Fix build error and host/device warnings on 32-bit builds with CUDA.

Error: Throwing an exception in CUDA code.
Fix: Change method throwing exception to VTKM_CONT.
New warning: host/device warning in taotuple.
Fix: Markup additional taotuple methods with suppressions.

This also updates our taotuple checkout to match upstream master.
parent 768086a0
......@@ -54,11 +54,11 @@ public:
using IteratorType = IteratorT;
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalFromIterators() {}
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalFromIterators(IteratorT begin, IteratorT end)
: BeginIterator(begin)
{
......@@ -80,8 +80,9 @@ public:
/// type that can be copied to this iterator type. This allows us to do any
/// type casting that the iterators do (like the non-const to const cast).
///
VTKM_SUPPRESS_EXEC_WARNINGS
template <class OtherIteratorT>
VTKM_EXEC_CONT ArrayPortalFromIterators(const ArrayPortalFromIterators<OtherIteratorT>& src)
VTKM_CONT ArrayPortalFromIterators(const ArrayPortalFromIterators<OtherIteratorT>& src)
: BeginIterator(src.GetIteratorBegin())
, NumberOfValues(src.GetNumberOfValues())
{
......@@ -128,7 +129,7 @@ public:
using IteratorType = IteratorT;
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalFromIterators()
: BeginIterator(nullptr)
, NumberOfValues(0)
......@@ -136,7 +137,7 @@ public:
}
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalFromIterators(IteratorT begin, IteratorT end)
: BeginIterator(begin)
{
......@@ -158,8 +159,9 @@ public:
/// type that can be copied to this iterator type. This allows us to do any
/// type casting that the iterators do (like the non-const to const cast).
///
VTKM_SUPPRESS_EXEC_WARNINGS
template <class OtherIteratorT>
VTKM_EXEC_CONT ArrayPortalFromIterators(const ArrayPortalFromIterators<OtherIteratorT>& src)
VTKM_CONT ArrayPortalFromIterators(const ArrayPortalFromIterators<OtherIteratorT>& src)
: BeginIterator(src.GetIteratorBegin())
, NumberOfValues(src.GetNumberOfValues())
{
......@@ -223,7 +225,7 @@ public:
using IteratorType = _IteratorType;
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalToIterators(const PortalType& portal)
: Iterator(portal.GetIteratorBegin())
, NumberOfValues(portal.GetNumberOfValues())
......@@ -237,7 +239,7 @@ public:
using IteratorType = stdext::checked_array_iterator<_IteratorType>;
VTKM_SUPPRESS_EXEC_WARNINGS
VTKM_EXEC_CONT
VTKM_CONT
ArrayPortalToIterators(const PortalType& portal)
: Iterator(portal.GetIteratorBegin(), static_cast<size_t>(portal.GetNumberOfValues()))
, NumberOfValues(portal.GetNumberOfValues())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment