Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
gaoxinyu18
VTK
Commits
6b71feb3
Commit
6b71feb3
authored
5 years ago
by
Robert Maynard
Browse files
Options
Downloads
Patches
Plain Diff
Update VTK-m for GCC 4.8.5 fixes and osx-clang warning fixes
parent
b172eb1f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx
+2
-1
2 additions, 1 deletion
Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx
ThirdParty/vtkm/vtkvtkm/vtk-m
+1
-1
1 addition, 1 deletion
ThirdParty/vtkm/vtkvtkm/vtk-m
with
3 additions
and
2 deletions
Accelerators/Vtkm/vtkmlib/ArrayConverters.hxx
+
2
−
1
View file @
6b71feb3
...
...
@@ -46,7 +46,8 @@ vtkm::cont::VariantArrayHandle vtkDataArrayToVariantArrayHandle(DataArrayType* i
{
vtkm
::
Id
numTuples
=
input
->
GetNumberOfTuples
();
auto
subHandle
=
DataArrayToArrayHandle
<
DataArrayType
,
1
>::
Wrap
(
input
);
auto
offsets
=
vtkm
::
cont
::
ArrayHandleCounting
<
vtkm
::
IdComponent
>
(
0
,
numComps
,
numTuples
);
auto
offsets
=
vtkm
::
cont
::
ArrayHandleCounting
<
vtkm
::
Id
>
(
vtkm
::
Id
(
0
),
vtkm
::
Id
(
numComps
),
numTuples
);
auto
handle
=
vtkm
::
cont
::
make_ArrayHandleGroupVecVariable
(
subHandle
,
offsets
);
return
vtkm
::
cont
::
VariantArrayHandle
(
handle
);
}
...
...
This diff is collapsed.
Click to expand it.
vtk-m
@
f395e084
Compare
b3082721
...
f395e084
Subproject commit
b30827215cfbfaae05943699d176ff1ca0e1047
1
Subproject commit
f395e084d821265d4ddc782f22c8d9edf8f1f41
1
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment