diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-04-02 22:15:53 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-04-08 09:05:55 (GMT) |
| commit | ac3a1b14c0235cb21b1cce445269426e84e46ae1 (patch) | |
| tree | 7d2367774917b32721fe57852e3eda0659b50744 | |
| parent | 91f3699000084804100a782e93509a3a53adc2a8 (diff) | |
| download | CMake-ac3a1b14c0235cb21b1cce445269426e84e46ae1.zip CMake-ac3a1b14c0235cb21b1cce445269426e84e46ae1.tar.gz CMake-ac3a1b14c0235cb21b1cce445269426e84e46ae1.tar.bz2 | |
Features: Add cxx_deleted_functions.
| -rw-r--r-- | Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst | 5 | ||||
| -rw-r--r-- | Modules/Compiler/GNU-CXX-FeatureTests.cmake | 1 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 1 | ||||
| -rw-r--r-- | Tests/CompileFeatures/cxx_deleted_functions.cpp | 6 |
4 files changed, 13 insertions, 0 deletions
diff --git a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst index bf91fbc..df80abf 100644 --- a/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst +++ b/Help/variable/CMAKE_CXX_KNOWN_FEATURES.rst @@ -37,6 +37,11 @@ The features known to this version of CMake are: .. _N1986: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2006/n1986.pdf +``cxx_deleted_functions`` + Deleted functions, as defined in N2346_. + + .. _N2346: http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2346.htm + ``cxx_final`` Override control ``final`` keyword, as defined in N2928_. diff --git a/Modules/Compiler/GNU-CXX-FeatureTests.cmake b/Modules/Compiler/GNU-CXX-FeatureTests.cmake index 7d3c13b..f01382f 100644 --- a/Modules/Compiler/GNU-CXX-FeatureTests.cmake +++ b/Modules/Compiler/GNU-CXX-FeatureTests.cmake @@ -19,6 +19,7 @@ set(_cmake_feature_test_cxx_constexpr "${GNU46_CXX11}") set(GNU44_CXX11 "${_oldestSupported} && __cplusplus >= 201103L") set(_cmake_feature_test_cxx_auto_type "${GNU44_CXX11}") set(_cmake_feature_test_cxx_defaulted_functions "${GNU44_CXX11}") +set(_cmake_feature_test_cxx_deleted_functions "${GNU44_CXX11}") set(_cmake_feature_test_cxx_strong_enums "${GNU44_CXX11}") set(_cmake_feature_test_cxx_trailing_return_types "${GNU44_CXX11}") set(_cmake_feature_test_cxx_variadic_templates "${GNU44_CXX11}") diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index c7c98aa..192171f 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -47,6 +47,7 @@ F(cxx_decltype) \ F(cxx_defaulted_functions) \ F(cxx_delegating_constructors) \ + F(cxx_deleted_functions) \ F(cxx_final) \ F(cxx_override) \ F(cxx_static_assert) \ diff --git a/Tests/CompileFeatures/cxx_deleted_functions.cpp b/Tests/CompileFeatures/cxx_deleted_functions.cpp new file mode 100644 index 0000000..4ecb1e9 --- /dev/null +++ b/Tests/CompileFeatures/cxx_deleted_functions.cpp @@ -0,0 +1,6 @@ + +struct A +{ + A(const A&) = delete; + A& operator=(const A&) = delete; +}; |