diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 11:37:24 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-12-07 22:46:49 +0100 |
| commit | 7d928d8c6eb03c4e5e0d1961e9b62718ab53fb46 (patch) | |
| tree | 43e827f3debcf3cfbc2c101c10ed2043bc880d9a /include/svl | |
| parent | 74dd206e67c2efb1e56d817be9e42a1ed82e3239 (diff) | |
HAVE_CXX14_CONSTEXPR is always true now
...but for safety, leave the configure.ac check in for some longer.
o3tl::array_view::max_size (include/o3tl/array_view.hxx) and
o3tl::basic_string_view::max_size (include/o3tl/string_view.hxx) started to
produce loplugin:staticmethods warnings, which I silenced by /not/ making the
functions static. Those classes are meant to be temporary drop-in replacements
for standard classes (std::span slated for C++20, prev. std::array_view; and
std::basic_string_view, resp.), so should have the same behavior as their
standard counterparts (and making the functions static would likely cause
loplugin:staticaccess warnings at call sites).
Change-Id: If21674dbf02886f453ca447544e37b184df5a25e
Reviewed-on: https://gerrit.libreoffice.org/64768
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/svl')
| -rw-r--r-- | include/svl/itemset.hxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 23d994ddb968..ba21e61ff1f8 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -27,7 +27,6 @@ #include <type_traits> #include <memory> -#include <config_global.h> #include <svl/svldllapi.h> #include <svl/poolitem.hxx> #include <svl/typedwhich.hxx> @@ -57,9 +56,7 @@ constexpr bool validRanges() { // std::size_t is no smaller than sal_uInt16: constexpr std::size_t rangeSize(sal_uInt16 wid1, sal_uInt16 wid2) { -#if HAVE_CXX14_CONSTEXPR assert(validRange(wid1, wid2)); -#endif return wid2 - wid1 + 1; } |