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/vcl/vclptr.hxx | |
| 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/vcl/vclptr.hxx')
| -rw-r--r-- | include/vcl/vclptr.hxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx index 39e4fe918d52..e3e0e827ee8e 100644 --- a/include/vcl/vclptr.hxx +++ b/include/vcl/vclptr.hxx @@ -65,8 +65,7 @@ public: typedef typename C< value, void *, void >::t t; }; -#if HAVE_CXX11_CONSTEXPR \ - && !(defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__) +#if !(defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__) template<typename> constexpr bool isIncompleteOrDerivedFromVclReferenceBase(...) { return true; } @@ -93,8 +92,7 @@ namespace detail { template <class reference_type> class VclPtr { -#if HAVE_CXX11_CONSTEXPR \ - && !(defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__) +#if !(defined _MSC_VER && _MSC_VER <= 1900 && !defined __clang__) static_assert( vcl::detail::isIncompleteOrDerivedFromVclReferenceBase<reference_type>( nullptr), |