diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-02 17:43:25 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-02 18:58:40 +0000 |
| commit | b167466147baec95a3b123a07d648fc2589bc3c9 (patch) | |
| tree | a203d24b236c49f7ea6538e6613df19b7d4b81ed /include/o3tl | |
| parent | 51c0054a6fb956ff758206b4113ae2e76f82f5d4 (diff) | |
Remove HAVE_CXX11_CONSTEXPR, always true now
...after 84b36c704d73362d4d86dc9e9c0efa0625958347 "Drop support for MSVC 2013".
Make this a fatal configuration error for now. The check should be removed
completely after LO 5.4 branch-off.
Change-Id: I990fd8fcb4ec1327282df4efe21640c938d3cf06
Reviewed-on: https://gerrit.libreoffice.org/34821
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/o3tl')
| -rw-r--r-- | include/o3tl/typed_flags_set.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/o3tl/typed_flags_set.hxx b/include/o3tl/typed_flags_set.hxx index 637fcfa6c3ff..dfb196a582e1 100644 --- a/include/o3tl/typed_flags_set.hxx +++ b/include/o3tl/typed_flags_set.hxx @@ -77,7 +77,7 @@ struct is_typed_flags { typename std::underlying_type<E>::type value): value_(value) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert(detail::isNonNegative(value)); assert( static_cast<typename std::underlying_type<E>::type>(~0) == M @@ -106,7 +106,7 @@ struct is_typed_flags { template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator ~(E rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(rhs))); @@ -129,7 +129,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator ^( E lhs, E rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(lhs))); @@ -146,7 +146,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator ^( E lhs, typename o3tl::typed_flags<E>::Wrap rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(lhs))); @@ -160,7 +160,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator ^( typename o3tl::typed_flags<E>::Wrap lhs, E rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(rhs))); @@ -188,7 +188,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator &( E lhs, E rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(lhs))); @@ -205,7 +205,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator &( E lhs, typename o3tl::typed_flags<E>::Wrap rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(lhs))); @@ -219,7 +219,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator &( typename o3tl::typed_flags<E>::Wrap lhs, E rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(rhs))); @@ -245,7 +245,7 @@ typename o3tl::typed_flags<typename W::Unwrapped::Self>::Wrap operator &( template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator |(E lhs, E rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(lhs))); @@ -262,7 +262,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator |( E lhs, typename o3tl::typed_flags<E>::Wrap rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(lhs))); @@ -276,7 +276,7 @@ template<typename E> inline SAL_CONSTEXPR typename o3tl::typed_flags<E>::Wrap operator |( typename o3tl::typed_flags<E>::Wrap lhs, E rhs) { -#if !HAVE_CXX11_CONSTEXPR || HAVE_CXX14_CONSTEXPR +#if HAVE_CXX14_CONSTEXPR assert( o3tl::detail::isNonNegative( static_cast<typename std::underlying_type<E>::type>(rhs))); |