diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-02 18:24:40 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-03 06:47:35 +0000 |
| commit | ba423579255848440318d6c468a604914901779b (patch) | |
| tree | 7c4bc01a2c7210bca3e8a19a012b15312f37b588 /include/rtl | |
| parent | afa675469cd9894f41a6b9eeb2e7acc8245d256c (diff) | |
Remove uses of SAL_CONSTEXPR in LIBO_INTERNAL_ONLY
Change-Id: I9a7dc7c83302b3361f056fcf6636bbba7672f15f
Reviewed-on: https://gerrit.libreoffice.org/34840
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/rtl')
| -rw-r--r-- | include/rtl/stringutils.hxx | 14 | ||||
| -rw-r--r-- | include/rtl/ustring.hxx | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/rtl/stringutils.hxx b/include/rtl/stringutils.hxx index dadbda61ec97..a88f5be861fd 100644 --- a/include/rtl/stringutils.hxx +++ b/include/rtl/stringutils.hxx @@ -72,7 +72,7 @@ namespace rtl @since LibreOffice 5.0 */ struct SAL_WARN_UNUSED OUStringLiteral1_ { - SAL_CONSTEXPR OUStringLiteral1_(sal_Unicode theC): c(theC) {} + constexpr OUStringLiteral1_(sal_Unicode theC): c(theC) {} sal_Unicode const c; }; #if defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__ @@ -173,9 +173,9 @@ struct ConstCharArrayDetector< const char[ N ], T > template<std::size_t N, typename T> struct ConstCharArrayDetector<sal_Unicode const [N], T> { using TypeUtf16 = T; - static SAL_CONSTEXPR bool const ok = true; - static SAL_CONSTEXPR std::size_t const length = N - 1; - static SAL_CONSTEXPR sal_Unicode const * toPointer( + static constexpr bool const ok = true; + static constexpr std::size_t const length = N - 1; + static constexpr sal_Unicode const * toPointer( sal_Unicode const (& literal)[N]) { return literal; } }; @@ -189,9 +189,9 @@ template<typename T> struct ConstCharArrayDetector< T> { using TypeUtf16 = T; - static SAL_CONSTEXPR bool const ok = true; - static SAL_CONSTEXPR std::size_t const length = 1; - static SAL_CONSTEXPR sal_Unicode const * toPointer( + static constexpr bool const ok = true; + static constexpr std::size_t const length = 1; + static constexpr sal_Unicode const * toPointer( OUStringLiteral1_ const & literal) { return &literal.c; } }; diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx index eed067c1b754..1bc66d3d8ac2 100644 --- a/include/rtl/ustring.hxx +++ b/include/rtl/ustring.hxx @@ -70,7 +70,7 @@ This class is not part of public API and is meant to be used only in LibreOffice */ struct SAL_WARN_UNUSED OUStringLiteral { - template<typename T> SAL_CONSTEXPR OUStringLiteral( + template<typename T> constexpr OUStringLiteral( T & literal, typename libreoffice_internal::ConstCharArrayDetector< T, libreoffice_internal::Dummy>::Type |