From 45195b9f7ed17b508d662bfa2887a81fd4c1136e Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 20 Sep 2018 10:34:46 -0400 Subject: [PATCH] [fsresizer] Remove over-enthusiastic constexpr --- src/modules/fsresizer/ResizeFSJob.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/modules/fsresizer/ResizeFSJob.h b/src/modules/fsresizer/ResizeFSJob.h index 6308f12ed..85ed98cdc 100644 --- a/src/modules/fsresizer/ResizeFSJob.h +++ b/src/modules/fsresizer/ResizeFSJob.h @@ -34,7 +34,7 @@ class PLUGINDLLEXPORT ResizeFSJob : public Calamares::CppJob public: /** @brief Size expressions - * + * * Sizes can be specified in MiB or percent (of the device they * are on). This class handles parsing of such strings from the * config file. @@ -55,11 +55,11 @@ public: int value() const { return m_value; } Unit unit() const { return m_unit; } - constexpr bool isValid() const + bool isValid() const { return ( unit() != None ) && ( value() > 0 ); } - + private: int m_value; Unit m_unit; @@ -74,12 +74,12 @@ public: void setConfigurationMap( const QVariantMap& configurationMap ) override; - constexpr bool isValid() const + bool isValid() const { return ( !m_fsname.isEmpty() || !m_devicename.isEmpty() ) && m_size.isValid(); } - + private: RelativeSize m_size; RelativeSize m_atleast;