summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2018-11-24 17:41:50 +0100
committerStephan Bergmann <sbergman@redhat.com>2018-12-06 23:01:34 +0100
commitd7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d (patch)
tree21af0743d7f06165e43d52b4c29fb5cfba60d937 /include
parent65b9c62354f77c0d3ff02dfa3151447c629ef419 (diff)
Remove obsolete GCC version checks
...after <https://gerrit.libreoffice.org/63951> "Bump (Linux) GCC baseline to 7.0.0". (In some cases, those checks now need to check for __clang__, which was implicitly covered in the past by Clang consistently reporting to be GCC 4.2.1.) Change-Id: I860fef8c4ca41c22a7541f0fb2d34b37d1d69bed Reviewed-on: https://gerrit.libreoffice.org/63952 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include')
-rw-r--r--include/o3tl/safeint.hxx2
-rw-r--r--include/rtl/stringutils.hxx10
-rw-r--r--include/sal/types.h2
3 files changed, 2 insertions, 12 deletions
diff --git a/include/o3tl/safeint.hxx b/include/o3tl/safeint.hxx
index 6f879965840c..ae28ca4b6570 100644
--- a/include/o3tl/safeint.hxx
+++ b/include/o3tl/safeint.hxx
@@ -112,7 +112,7 @@ template<typename T> inline bool checked_sub(T a, T b, T& result)
return !msl::utilities::SafeSubtract(a, b, result);
}
-#elif (defined __GNUC__ && __GNUC__ >= 5) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && defined(__i386__)))
+#elif (defined __GNUC__ && !defined __clang__) || (__has_builtin(__builtin_mul_overflow) && !(defined ANDROID && defined __clang__) && !(defined(__clang__) && defined(__i386__)))
// 32-bit clang fails with undefined reference to `__mulodi4'
template<typename T> inline bool checked_multiply(T a, T b, T& result)
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx
index 7e9ff1cc86fd..6f3e18f9d202 100644
--- a/include/rtl/stringutils.hxx
+++ b/include/rtl/stringutils.hxx
@@ -229,12 +229,7 @@ struct ConstCharArrayDetector<sal_Unicode const [N], T> {
{ return literal; }
};
template<typename T> struct ConstCharArrayDetector<
-#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8 \
- && !defined __clang__
- OUStringLiteral1_ const,
-#else
OUStringLiteral1,
-#endif
T>
{
using TypeUtf16 = T;
@@ -260,12 +255,7 @@ struct ExceptConstCharArrayDetector< const char[ N ] >
template<std::size_t N>
struct ExceptConstCharArrayDetector<sal_Unicode const[N]> {};
template<> struct ExceptConstCharArrayDetector<
-#if defined __GNUC__ && __GNUC__ == 4 && __GNUC_MINOR__ <= 8 \
- && !defined __clang__
- OUStringLiteral1_ const
-#else
OUStringLiteral1
-#endif
>
{};
#endif
diff --git a/include/sal/types.h b/include/sal/types.h
index 6bf4de970f71..b687490ed949 100644
--- a/include/sal/types.h
+++ b/include/sal/types.h
@@ -678,7 +678,7 @@ template< typename T1, typename T2 > inline T1 static_int_cast(T2 n) {
#define __has_attribute(x) 0
#endif
-#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && __GNUC__ > 4) || (defined __clang__ && __has_attribute(returns_nonnull)))
+#if defined LIBO_INTERNAL_ONLY && ((defined __GNUC__ && !defined __clang__) || (defined __clang__ && __has_attribute(returns_nonnull)))
#define SAL_RETURNS_NONNULL __attribute__((returns_nonnull))
#else
#define SAL_RETURNS_NONNULL