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
This commit is contained in:
Brad King
2017-09-28 12:08:21 +00:00
committed by Kitware Robot
4 changed files with 1 additions and 21 deletions

View File

@@ -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;

View File

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

View File

@@ -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)

View File

@@ -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