diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-28 12:08:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-28 12:08:27 (GMT) |
| commit | 50e4a45b9f7028d4476cf370caf5fa73ffedd95b (patch) | |
| tree | 746b4325881075c92fd18e2bfd8525caf2e38a4a | |
| parent | a1d59d3e07dbc180abce8aeca4e6bba72985ff23 (diff) | |
| parent | 9e0362caa1f838579b6c863b44e311972c3c95ae (diff) | |
| download | CMake-50e4a45b9f7028d4476cf370caf5fa73ffedd95b.zip CMake-50e4a45b9f7028d4476cf370caf5fa73ffedd95b.tar.gz CMake-50e4a45b9f7028d4476cf370caf5fa73ffedd95b.tar.bz2 | |
Merge topic 'remove-auto_ptr-checks'
9e0362ca Remove checks for auto_ptr that we no longer need
94e67fa1 cpack: Fix compilation on Cygwin after auto_ptr removal
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1320
| -rw-r--r-- | Source/CPack/cpack.cxx | 2 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx_auto_ptr.cxx | 18 | ||||
| -rw-r--r-- | Source/Checks/cm_cxx_features.cmake | 1 | ||||
| -rw-r--r-- | Source/cmConfigure.cmake.h.in | 1 |
4 files changed, 1 insertions, 21 deletions
diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx index f2c54fc..addb54e 100644 --- a/Source/CPack/cpack.cxx +++ b/Source/CPack/cpack.cxx @@ -194,7 +194,7 @@ int main(int argc, char const* const* argv) cmGlobalGenerator cmgg(&cminst); cmMakefile globalMF(&cmgg, cminst.GetCurrentSnapshot()); #if defined(__CYGWIN__) - globalMF->AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0"); + globalMF.AddDefinition("CMAKE_LEGACY_CYGWIN_WIN32", "0"); #endif bool cpackConfigFileSpecified = true; diff --git a/Source/Checks/cm_cxx_auto_ptr.cxx b/Source/Checks/cm_cxx_auto_ptr.cxx deleted file mode 100644 index d3100fd..0000000 --- a/Source/Checks/cm_cxx_auto_ptr.cxx +++ /dev/null @@ -1,18 +0,0 @@ -#include <memory> - -std::auto_ptr<int> get_auto_ptr() -{ - std::auto_ptr<int> ptr; - ptr = std::auto_ptr<int>(new int(0)); - return ptr; -} - -int use_auto_ptr(std::auto_ptr<int> ptr) -{ - return *ptr; -} - -int main() -{ - return use_auto_ptr(get_auto_ptr()); -} diff --git a/Source/Checks/cm_cxx_features.cmake b/Source/Checks/cm_cxx_features.cmake index 2c39cbe..7755cfe 100644 --- a/Source/Checks/cm_cxx_features.cmake +++ b/Source/Checks/cm_cxx_features.cmake @@ -41,7 +41,6 @@ function(cm_check_cxx_feature name) endif() endfunction() -cm_check_cxx_feature(auto_ptr) cm_check_cxx_feature(eq_delete) cm_check_cxx_feature(fallthrough) if(NOT CMake_HAVE_CXX_FALLTHROUGH) diff --git a/Source/cmConfigure.cmake.h.in b/Source/cmConfigure.cmake.h.in index 9d11fff..f4e5fb8 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_AUTO_PTR #cmakedefine CMake_HAVE_CXX_EQ_DELETE #cmakedefine CMake_HAVE_CXX_FALLTHROUGH #cmakedefine CMake_HAVE_CXX_GNU_FALLTHROUGH |