diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-07-11 07:29:10 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-07-11 13:09:26 +0200 |
| commit | cb53a3508d086beecb440c78789932fb8eb30756 (patch) | |
| tree | d6206680ba47108bfcc71cf94bda5105db9fbe72 | |
| parent | bce7a874d121871dab7976cb148bfe2615a6bcb4 (diff) | |
Return constexpr to ErrCode ctors
... removed in commit e9c74a075c3c0809b993c017c11d1505bd244dc8.
assert should not prevent constexpr since C++14.
Change-Id: I5a42a3450689de16011fd594b10f74b1e0726fa6
Reviewed-on: https://gerrit.libreoffice.org/75388
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | include/vcl/errcode.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/vcl/errcode.hxx b/include/vcl/errcode.hxx index a6ef02762c5a..d189f038539b 100644 --- a/include/vcl/errcode.hxx +++ b/include/vcl/errcode.hxx @@ -63,12 +63,12 @@ enum class WarningFlag { Yes }; class SAL_WARN_UNUSED ErrCode final { public: - explicit ErrCode(WarningFlag, ErrCodeArea nArea, ErrCodeClass nClass, sal_uInt16 nCode) + explicit constexpr ErrCode(WarningFlag, ErrCodeArea nArea, ErrCodeClass nClass, sal_uInt16 nCode) : m_value(ERRCODE_WARNING_MASK | (sal_uInt32(nArea) << ERRCODE_AREA_SHIFT) | (sal_uInt32(nClass) << ERRCODE_CLASS_SHIFT) | nCode) { assert(nCode <= 0xff && "code out of range"); } - explicit ErrCode(ErrCodeArea nArea, ErrCodeClass nClass, sal_uInt16 nCode) + explicit constexpr ErrCode(ErrCodeArea nArea, ErrCodeClass nClass, sal_uInt16 nCode) : m_value((sal_uInt32(nArea) << ERRCODE_AREA_SHIFT) | (sal_uInt32(nClass) << ERRCODE_CLASS_SHIFT) | nCode) { assert(nCode <= 0xff && "code out of range"); |