diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-28 13:50:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-09-28 13:50:18 (GMT) |
| commit | b8018135b5729b5c74a0c95ab2b8cc8677fbe5b8 (patch) | |
| tree | d4c9f1bf34bcfc2e6094e0a84def5ea249cf0b78 /Source/cmConfigure.cmake.h.in | |
| parent | 42f4e6974c99cfdd6727f2fcd35c83f431ab10a5 (diff) | |
| download | CMake-b8018135b5729b5c74a0c95ab2b8cc8677fbe5b8.zip CMake-b8018135b5729b5c74a0c95ab2b8cc8677fbe5b8.tar.gz CMake-b8018135b5729b5c74a0c95ab2b8cc8677fbe5b8.tar.bz2 | |
Use C++11 '= delete' instead of CM_EQ_DELETE
We now require C++11 support including `= delete`. Drop use of
the old compatibility macro.
Diffstat (limited to 'Source/cmConfigure.cmake.h.in')
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 5f3110c..9a78aca 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -19,7 +19,6 @@ #cmakedefine HAVE_UNSETENV #cmakedefine CMAKE_USE_ELF_PARSER #cmakedefine CMAKE_USE_MACH_PARSER -#cmakedefine CMake_HAVE_CXX_EQ_DELETE #cmakedefine CMake_HAVE_CXX_FALLTHROUGH #cmakedefine CMake_HAVE_CXX_GNU_FALLTHROUGH #cmakedefine CMake_HAVE_CXX_ATTRIBUTE_FALLTHROUGH @@ -27,12 +26,6 @@ #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@" #define CMAKE_DATA_DIR "/@CMAKE_DATA_DIR@" -#ifdef CMake_HAVE_CXX_EQ_DELETE -#define CM_EQ_DELETE = delete -#else -#define CM_EQ_DELETE -#endif - #if defined(CMake_HAVE_CXX_FALLTHROUGH) #define CM_FALLTHROUGH [[fallthrough]] #elif defined(CMake_HAVE_CXX_GNU_FALLTHROUGH) @@ -44,7 +37,7 @@ #endif #define CM_DISABLE_COPY(Class) \ - Class(Class const&) CM_EQ_DELETE; \ - Class& operator=(Class const&) CM_EQ_DELETE; + Class(Class const&) = delete; \ + Class& operator=(Class const&) = delete; #endif |