Merge topic 'remove-cxx11-references'
ecd4a68ff cxx,c++: Remove c++14 references Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kenneth Moreland <morelandkd@ornl.gov> Merge-request: !2999
This commit is contained in:
commit
5bf0bd57ae
@ -67,7 +67,7 @@ effort.
|
|||||||
|
|
||||||
VTK-m Requires:
|
VTK-m Requires:
|
||||||
|
|
||||||
+ C++11 Compiler. VTK-m has been confirmed to work with the following
|
+ C++14 Compiler. VTK-m has been confirmed to work with the following
|
||||||
+ GCC 5.4+
|
+ GCC 5.4+
|
||||||
+ Clang 5.0+
|
+ Clang 5.0+
|
||||||
+ XCode 5.0+
|
+ XCode 5.0+
|
||||||
|
@ -181,7 +181,7 @@ for (auto v : vector)
|
|||||||
avoided in class, method, and function scopes (fully qualified
|
avoided in class, method, and function scopes (fully qualified
|
||||||
namespace references are preferred).
|
namespace references are preferred).
|
||||||
|
|
||||||
+ All code must be valid by the C++11 specifications. It must also
|
+ All code must be valid by the C++14 specifications. It must also
|
||||||
compile with Microsoft Visual Studio 2015.
|
compile with Microsoft Visual Studio 2015.
|
||||||
|
|
||||||
+ New code must include regression tests that will run on the dashboards.
|
+ New code must include regression tests that will run on the dashboards.
|
||||||
|
@ -312,12 +312,12 @@
|
|||||||
#define VTKM_CUDA_VERSION_MINOR @VTKM_CUDA_VERSION_MINOR@
|
#define VTKM_CUDA_VERSION_MINOR @VTKM_CUDA_VERSION_MINOR@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if __cplusplus >= 201103L || \
|
#if __cplusplus >= 201402L || \
|
||||||
( defined(VTKM_MSVC) && _MSC_VER >= 1900 ) || \
|
( defined(VTKM_MSVC) && _MSC_VER >= 1910 ) || \
|
||||||
( defined(VTKM_ICC) && defined(__INTEL_CXX11_MODE__) )
|
( defined(VTKM_ICC) && defined(__INTEL_CXX11_MODE__) )
|
||||||
#define VTKM_HAVE_CXX_11
|
#define VTKM_HAVE_CXX_14
|
||||||
#else
|
#else
|
||||||
#error "VTK-m requires at least a C++11 compiler"
|
#error "VTK-m requires at least a C++14 compiler"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
//Mark if we have enabled logging.
|
//Mark if we have enabled logging.
|
||||||
|
Loading…
Reference in New Issue
Block a user