Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-09-08 21:33:55 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'non-tested-fixes'

Browse Source 
7ded85f01 Remove reference to Canvas in ImageReaderBase
7fa2c9f76 Update doxygen comments in Tuple.h.in

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2119
This commit is contained in:
Kenneth Moreland 2020-06-03 17:28:16 +00:00 committed by Kitware Robot
commit c1c8e54940
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/Tuple.h.in
View File

@ -172,6 +172,7 @@ VTKM_EXEC_CONT auto make_tuple(Ts&&... args) -> decltype(vtkm::MakeTuple(std::fo
return vtkm::MakeTuple(std::forward<Ts>(args)...);
}
/// @cond NONE
namespace detail
{
struct TupleTransformFunctor
@ -212,6 +213,7 @@ VTKM_EXEC_CONT auto TupleForEach(TupleType&& tuple, Function&& f)
}
} // namespace detail
/// @endcond
template <>
class Tuple<>

1
vtkm/io/ImageReaderBase.cxx
View File

@ -11,7 +11,6 @@
#include <vtkm/io/ImageReaderBase.h>
#include <vtkm/cont/DataSetBuilderUniform.h>
#include <vtkm/rendering/Canvas.h>
namespace vtkm
{