diff options
| author | Douglas Gregor <dgregor@apple.com> | 2011-11-01 01:19:34 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2011-11-01 01:19:34 +0000 |
| commit | f695a6952f111e79c685301c292755908473f297 (patch) | |
| tree | dc28dfcd476d96c178357d2bcbd91099a6b07d5d | |
| parent | 76852c218a207ef43583515cb835b6e855353a0f (diff) | |
Add __has_feature(cxx_defaulted_functions) for querying "defaulted
functions", from Michel Morin!
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@143411 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | docs/LanguageExtensions.html | 7 | ||||
| -rw-r--r-- | lib/Lex/PPMacroExpansion.cpp | 1 | ||||
| -rw-r--r-- | test/Lexer/has_feature_cxx0x.cpp | 8 |
3 files changed, 16 insertions, 0 deletions
diff --git a/docs/LanguageExtensions.html b/docs/LanguageExtensions.html index becdbfac4d..34e205613b 100644 --- a/docs/LanguageExtensions.html +++ b/docs/LanguageExtensions.html @@ -46,6 +46,7 @@ <li><a href="#cxx_constexpr">C++11 generalized constant expressions</a></li> <li><a href="#cxx_decltype">C++11 <tt>decltype()</tt></a></li> <li><a href="#cxx_default_function_template_args">C++11 default template arguments in function templates</a></li> + <li><a href="#cxx_defaulted_functions">C++11 defaulted functions</a></li> <li><a href="#cxx_delegating_constructor">C++11 delegating constructors</a></li> <li><a href="#cxx_deleted_functions">C++11 deleted functions</a></li> <li><a href="#cxx_explicit_conversions">C++11 explicit conversion functions</a></li> @@ -509,6 +510,12 @@ enabled. Clang does not currently implement this feature.</p> <tt>__has_extension(cxx_default_function_template_args)</tt> to determine if support for default template arguments in function templates is enabled.</p> +<h4 id="cxx_defaulted_functions">C++11 <tt>default</tt>ed functions</h4> + +<p>Use <tt>__has_feature(cxx_defaulted_functions)</tt> or +<tt>__has_extension(cxx_defaulted_functions)</tt> to determine if support for +defaulted function definitions (with <tt>= default</tt>) is enabled.</p> + <h4 id="cxx_delegating_constructors">C++11 delegating constructors</h4> <p>Use <tt>__has_feature(cxx_delegating_constructors)</tt> to determine if diff --git a/lib/Lex/PPMacroExpansion.cpp b/lib/Lex/PPMacroExpansion.cpp index 7557f2e0fe..fd04b8a379 100644 --- a/lib/Lex/PPMacroExpansion.cpp +++ b/lib/Lex/PPMacroExpansion.cpp @@ -628,6 +628,7 @@ static bool HasFeature(const Preprocessor &PP, const IdentifierInfo *II) { //.Case("cxx_constexpr", false); .Case("cxx_decltype", LangOpts.CPlusPlus0x) .Case("cxx_default_function_template_args", LangOpts.CPlusPlus0x) + .Case("cxx_defaulted_functions", LangOpts.CPlusPlus0x) .Case("cxx_delegating_constructors", LangOpts.CPlusPlus0x) .Case("cxx_deleted_functions", LangOpts.CPlusPlus0x) .Case("cxx_explicit_conversions", LangOpts.CPlusPlus0x) diff --git a/test/Lexer/has_feature_cxx0x.cpp b/test/Lexer/has_feature_cxx0x.cpp index f2b4576b57..eff9cfb892 100644 --- a/test/Lexer/has_feature_cxx0x.cpp +++ b/test/Lexer/has_feature_cxx0x.cpp @@ -79,6 +79,14 @@ int no_deleted_functions(); // CHECK-0X: has_deleted_functions // CHECK-NO-0X: no_deleted_functions +#if __has_feature(cxx_defaulted_functions) +int has_defaulted_functions(); +#else +int no_defaulted_functions(); +#endif + +// CHECK-0X: has_defaulted_functions +// CHECK-NO-0X: no_defaulted_functions #if __has_feature(cxx_rvalue_references) int has_rvalue_references(); |