diff options
Diffstat (limited to 'external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1')
-rw-r--r-- | external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 b/external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 deleted file mode 100644 index a0e1a362bb31..000000000000 --- a/external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 +++ /dev/null @@ -1,32 +0,0 @@ -From a90326d10f1f63e78b996fd3db1cb4c43960e406 Mon Sep 17 00:00:00 2001 -From: osnola <alonso@loria.fr> -Date: Wed, 19 Jul 2017 12:04:41 +0200 -Subject: [PATCH] clang: do not use defined(__has_cpp_attribute) and - __has_cpp_attribute(clang::fallthrough) on the same line... - ---- - src/lib/libstaroffice_internal.hxx | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/lib/libstaroffice_internal.hxx b/src/lib/libstaroffice_internal.hxx -index edf806c..e362116 100644 ---- a/src/lib/libstaroffice_internal.hxx -+++ b/src/lib/libstaroffice_internal.hxx -@@ -113,9 +113,11 @@ struct STOFF_shared_ptr_noop_deleter { - /** fall through attributes */ - #define STOFF_FALLTHROUGH - #if defined(__clang__) --# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) --# undef STOFF_FALLTHROUGH --# define STOFF_FALLTHROUGH [[clang::fallthrough]] -+# if defined(__has_cpp_attribute) -+# if __has_cpp_attribute(clang::fallthrough) -+# undef STOFF_FALLTHROUGH -+# define STOFF_FALLTHROUGH [[clang::fallthrough]] -+# endif - # endif - #elif defined(__GNUC__) - # if __GNUC__>=7 --- -2.13.0 - |