Shuenhoy/vtk-m
1
0
Fork 0
mirror of https://gitlab.kitware.com/vtk/vtk-m synced 2024-10-05 01:49:02 +00:00
Code Issues 2 Actions Packages Projects Releases Wiki Activity

Merge topic 'identify_xl'

Browse Source 
292ac2e4c clang is not is_trivially safe
8e588504f Merge branch 'identify_xl' of gitlab.kitware.com:mclarsen/vtk-m into identify_xl
9c5396394 Merge remote-tracking branch 'upstream/master' into identify_xl
8d8228f36 correct type in comment
4d7a08c18 add xl compiler identification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kenneth Moreland <kmorel@acm.org>
Merge-request: !2440
This commit is contained in:
Matt Larsen 2021-03-20 17:00:34 +00:00 committed by Kitware Robot
commit b64502e22d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vtkm/internal/Configure.h.in
View File

@ -40,6 +40,10 @@
// it before gcc.
#define VTKM_PGI
#elif defined(__ibmxl__)
//Check for xl before GCC and clang, as xl claims it is many things
#define VTKM_XL
#elif defined(__clang__)
//Check for clang before GCC, as clang says it is GNUC since it has ABI
//compliance

2
vtkmstd/is_trivial.h
View File

@ -17,8 +17,6 @@
#if defined(VTKM_GCC) && !defined(VTKM_USING_GLIBCXX_4)
#define VTKM_USE_STD_IS_TRIVIAL
#elif defined(VTKM_CLANG)
#define VTKM_USE_STD_IS_TRIVIAL
#endif
#ifndef VTKM_USE_STD_IS_TRIVIAL