diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-11-29 13:45:27 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-11-30 08:25:13 +0100 |
| commit | 83102e4fa21e22ae18d2bbd19e29b1d37f50bab9 (patch) | |
| tree | b979377c22ffead4ff842eb4cdb3a18899cb7c94 /include/rtl | |
| parent | f3ea5e21bea80004b04edbf0287d4a2e1aaef5d0 (diff) | |
Remove obsolete _MSC_VER checks
...after 206b8c4ae320d7d8614f21800d8f77fa29f8f5ff "On Windows, check for at
least Visual Studio 2017 version 15.7"
Change-Id: I38ee86e1649bbdc828a7e328f2dbbac0dc163c8a
Reviewed-on: https://gerrit.libreoffice.org/64250
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/rtl')
| -rw-r--r-- | include/rtl/stringutils.hxx | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx index f7cd0ad1a47d..7e9ff1cc86fd 100644 --- a/include/rtl/stringutils.hxx +++ b/include/rtl/stringutils.hxx @@ -65,12 +65,7 @@ namespace rtl Instances of OUStringLiteral1 need to be const, as those literal-optimized functions take the literal argument by non-const lvalue reference, for - technical reasons. Except with MSVC, at least up to Visual Studio 2013: - For one, it fails to take that const-ness into account when trying to match - "OUStringLiteral1_ const" against T in a "T & literal" parameter of a - function template. But for another, as a language extension, it allows to - bind non-const temporary OUStringLiteral1_ instances to non-const lvalue - references, but also with a warning that thus needs to be disabled. + technical reasons. @since LibreOffice 5.0 */ @@ -78,13 +73,7 @@ struct SAL_WARN_UNUSED OUStringLiteral1_ { constexpr OUStringLiteral1_(sal_Unicode theC): c(theC) {} sal_Unicode const c; }; -#if defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__ - // Visual Studio 2015 -using OUStringLiteral1 = OUStringLiteral1_; -#pragma warning(disable: 4239) // nonstandard extension used: 'argument': conversion from 'rtl::OUStringLiteral1_' to 'rtl::OUStringLiteral1_ &' -#else using OUStringLiteral1 = OUStringLiteral1_ const; -#endif /// @endcond #endif |