diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-24 17:41:50 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-06 23:01:34 +0100 |
| commit | d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d (patch) | |
| tree | 21af0743d7f06165e43d52b4c29fb5cfba60d937 /include/rtl | |
| parent | Bump (Linux) GCC baseline to 7.0.0 (diff) | |
| download | core-d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d.tar.gz core-d7b46ef1cf69c9fe5c4c36958ca5d5b40de8cf8d.zip | |
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/rtl')
| -rw-r--r-- | include/rtl/stringutils.hxx | 10 |
1 files changed, 0 insertions, 10 deletions
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 |