Browse Source

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 <[email protected]>
Merge-request: !1320
Brad King 8 years ago
parent
commit
50e4a45b9f

+ 1 - 1
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;

+ 0 - 18
Source/Checks/cm_cxx_auto_ptr.cxx

@@ -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());
-}

+ 0 - 1
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)

+ 0 - 1
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