Commit babcc816 authored by Shawn Waldon's avatar Shawn Waldon Committed by Kitware Robot

Merge topic 'fixup-cxx11-detection'

8db1e79a Use override/final/=delete anytime the compiler supports them
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard's avatarRobert Maynard <robert.maynard@kitware.com>
Merge-request: !1902
parents acb0d1f7 8db1e79a
......@@ -150,14 +150,17 @@
# define VTK_MAXPATH 32767 // Possible with Windows "extended paths"
#endif
#cmakedefine VTK_USE_CXX11_FEATURES
#ifdef VTK_USE_CXX11_FEATURES
#if (__cplusplus >= 201103L) || ( defined(_MSC_VER) && _MSC_VER >= 1700 )
# define VTK_OVERRIDE override
# define VTK_FINAL final
# define VTK_DELETE_FUNCTION =delete
#else
# define VTK_OVERRIDE
# define VTK_FINAL
#endif
#if (__cplusplus >= 201103L) || ( defined(_MSC_VER) && _MSC_VER >= 1800 )
# define VTK_DELETE_FUNCTION =delete
#else
# define VTK_DELETE_FUNCTION
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment