Shuenhoy/vtk-m2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add the gcc 4.8.5 release date to our VTKM_USING_GLIBCXX_4 check

Browse Source
This commit is contained in:
Robert Maynard 2019-12-17 09:33:12 -05:00
parent bc148cc556
commit 201e5c81d3
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vtkm/Assert.h
View File

@ -13,7 +13,7 @@
#include <vtkm/internal/Configure.h>
#include <assert.h>
#include <cassert>
/// \def VTKM_ASSERT(condition)
///

2
vtkm/Bitset.h
View File

@ -11,7 +11,7 @@
#ifndef vtk_m_Bitset_h
#define vtk_m_Bitset_h
#include <assert.h>
#include <cassert>
#include <limits>
#include <vtkm/Types.h>
#include <vtkm/internal/ExportMacros.h>

2
vtkm/StaticAssert.h
View File

@ -10,8 +10,8 @@
#ifndef vtk_m_StaticAssert_h
#define vtk_m_StaticAssert_h
#include <type_traits>
#include <vtkm/internal/Configure.h>
#define VTKM_STATIC_ASSERT(condition) \
static_assert((condition), "Failed static assert: " #condition)

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

@ -156,11 +156,14 @@
#define VTKM_THIRDPARTY_POST_INCLUDE
#endif
#include <cctype> //needed to get the __GLIBCXX__ macro
#if defined(__GLIBCXX__) && \
(__GLIBCXX__ < 20150422 || __GLIBCXX__ == 20160726 || __GLIBCXX__ == 20150626)
(__GLIBCXX__ < 20150422 || __GLIBCXX__ == 20160726 || __GLIBCXX__ == 20150626 || \
__GLIBCXX__ == 20150623)
// GCC release date mapping
// 20160726 == 4.9.4
// 20150626 == 4.9.3
// 20150623 == 4.8.5
// 20150422 == 5.1
// 20141030 == 4.9.2
// See https://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html#abi.versioning.__GLIBCXX__