Remove obsolete CLANG_VERSION checks

Desktop / LibreOffice - Stephan Bergmann [redhat.com] - 4 December 2018 16:01 EST

...now that the (Linux) Clang baseline has been bumped ot 5.0.2 (see "minutes of ESC call ...").

(This commit precedes a commit that will actually enforce Clang >= 5.0.2 in configure.ac. However, it was easier to do it in this order, as that other commit will drop CLANG_VERSION when building with Apple Clang (where version numbers are different from upstream), so these checks would start to fail there.)

Change-Id: Icb3df0d0cf476e14c5453f02bdfc9e5bed066ca1 Reviewed-on: https://gerrit.libreoffice.org/63898

###

diff --git a/include/unoidl/unoidl.hxx b/include/unoidl/unoidl.hxx
index 89a7dd593863..27f2071fc4b1 100644
--- a/include/unoidl/unoidl.hxx
+++ b/include/unoidl/unoidl.hxx
@@ -15,7 +15,6 @@
#include
#include

-#include
#include
#include
#include
@@ -506,9 +505,6 @@ public:
};

Constructor():
-#if defined __clang__ && CLANG_VERSION == 30800
- annotations(),
-#endif
defaultConstructor(true) {}

Constructor(
diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
index 61d2be064b0b..ee38c9d9d16b 100644
--- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx
@@ -19,7 +19,6 @@

#include

-#include
#include
#include
#include
@@ -466,7 +465,7 @@ public:
mpSecondArg( rSecondArg )
{
}
-#if (defined(__clang__) && CLANG_VERSION >=30700) || (defined (__GNUC__) && __GNUC__ >= 8)
+#if defined(__clang__) || (defined (__GNUC__) && __GNUC__ >= 8)
//GetEquationValueAsDouble calls isFinite on the result
__attribute__((no_sanitize("float-divide-by-zero")))
#endif

60610d4f5d9f Remove obsolete CLANG_VERSION checks
include/unoidl/unoidl.hxx | 4 ----
svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx | 3 +--
2 files changed, 1 insertion(+), 6 deletions(-)

Upstream: cgit.freedesktop.org


  • Share