diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-09-24 12:07:26 +0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-09-24 17:32:22 +0200 |
| commit | 414316a04fe9479dafcb36e3617ee1f5813c6a30 (patch) | |
| tree | ff7e111dad25f1e5eaa12fcaa49105d3880e36f2 /codemaker | |
| parent | 72da78be20ebe1cd62ba7a5ac6e29b9d40f00f15 (diff) | |
Drop some newly obsolete __clang_major__ version checks
...after 6ef2d358ac053ce0f6de9cf0f8f25e8bae66d441 "Adapt Clang and GCC minimum
version checks"
Change-Id: Ib25fbb76211d1bda1d230de771f207960e645421
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157204
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/source/cppumaker/cpputype.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx index cb3422de16d0..124f323630bf 100644 --- a/codemaker/source/cppumaker/cpputype.cxx +++ b/codemaker/source/cppumaker/cpputype.cxx @@ -3017,10 +3017,8 @@ void ExceptionType::dumpHdlFile( if (name_ == "com.sun.star.uno.Exception") { // LIBO_INTERNAL_ONLY implies GCC >= 7, which we need for this - // Merely checking __has_include is not enough because some systems have the header, - // but do not have a new enough Clang 9 supporting __builtin_FILE/LINE/FUNCTION as used by - // that libstdc++ header. - includes.addCustom("#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && !defined __clang__) || (defined __clang__ && __clang_major__ >= 9)) && __has_include(<experimental/source_location>)"); + // libstdc++ header. + includes.addCustom("#if defined LIBO_INTERNAL_ONLY && (defined __GNUC__ || defined __clang__) && __has_include(<experimental/source_location>)"); includes.addCustom("#define LIBO_USE_SOURCE_LOCATION"); includes.addCustom("#endif"); includes.addCustom("#if defined LIBO_USE_SOURCE_LOCATION"); |