Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

VTK-m
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

b2e39ad8

Commit b2e39ad8 authored 9 years ago by Kenneth Moreland

Downloads
- Plain Diff

Merge branch 'type-conversions'

parents 29319d1c 66aa10aa

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

vtkm/VecTraits.h 20 additions, 21 deletions

vtkm/VecTraits.h
vtkm/cont/ArrayHandle.h 1 addition, 1 deletion

vtkm/cont/ArrayHandle.h
vtkm/cont/ArrayHandleCounting.h 8 additions, 1 deletion

vtkm/cont/ArrayHandleCounting.h
vtkm/cont/cuda/ChooseCudaDevice.h 40 additions, 40 deletions

vtkm/cont/cuda/ChooseCudaDevice.h
vtkm/cont/internal/testing/UnitTestArrayPortalFromIterators.cxx 1 addition, 1 deletion

...ont/internal/testing/UnitTestArrayPortalFromIterators.cxx
vtkm/cont/internal/testing/UnitTestIteratorFromArrayPortal.cxx 1 addition, 1 deletion

...cont/internal/testing/UnitTestIteratorFromArrayPortal.cxx
vtkm/cont/testing/TestingFancyArrayHandles.h 74 additions, 34 deletions

vtkm/cont/testing/TestingFancyArrayHandles.h
vtkm/cont/testing/UnitTestArrayHandleCounting.cxx 7 additions, 0 deletions

vtkm/cont/testing/UnitTestArrayHandleCounting.cxx
vtkm/cont/testing/UnitTestArrayPortalToIterators.cxx 1 addition, 1 deletion

vtkm/cont/testing/UnitTestArrayPortalToIterators.cxx
vtkm/testing/Testing.h 20 additions, 7 deletions

vtkm/testing/Testing.h

with 173 additions and 107 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment