diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-25 15:25:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-25 15:26:24 (GMT) |
| commit | ebe436eb97bf81704a1d0b074b3da4ac817f37d3 (patch) | |
| tree | ae29917c18a9ef90b62da4f616fbf2e8e702fb68 /Source/cmConfigure.cmake.h.in | |
| parent | 53305ce5b067c4feaa91ffe0cc82b740af525b3f (diff) | |
| parent | 5962db438939ef2754509b8578af1f845ec07dc8 (diff) | |
| download | CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.zip CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.tar.gz CMake-ebe436eb97bf81704a1d0b074b3da4ac817f37d3.tar.bz2 | |
Merge topic 'cxx11-nullptr'
5962db43 Use C++11 nullptr
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1175
Diffstat (limited to 'Source/cmConfigure.cmake.h.in')
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index a920bf2..00b63a5 100644 --- a/Source/cmConfigure.cmake.h.in +++ b/Source/cmConfigure.cmake.h.in @@ -25,7 +25,6 @@ #cmakedefine CMake_HAVE_CXX_GNU_FALLTHROUGH #cmakedefine CMake_HAVE_CXX_ATTRIBUTE_FALLTHROUGH #cmakedefine CMake_HAVE_CXX_MAKE_UNIQUE -#cmakedefine CMake_HAVE_CXX_NULLPTR #cmakedefine CMake_HAVE_CXX_OVERRIDE #cmakedefine CMake_HAVE_CXX_UNIQUE_PTR #define CMAKE_BIN_DIR "/@CMAKE_BIN_DIR@" @@ -47,12 +46,6 @@ elif defined(CMake_HAVE_CXX_ATTRIBUTE_FALLTHROUGH) #define CM_FALLTHROUGH #endif -#ifdef CMake_HAVE_CXX_NULLPTR -#define CM_NULLPTR nullptr -#else -#define CM_NULLPTR 0 -#endif - #ifdef CMake_HAVE_CXX_OVERRIDE #define CM_OVERRIDE override #else |