From 3ae5e274eec7974da2733b636b59c853b56d03e8 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sat, 14 Oct 2017 00:40:40 +0100 Subject: [PATCH] Removed workarounds that were needed to support older versions of MSVC. --- src/blackmisc/json.h | 4 ++-- src/blackmisc/pq/measurementunit.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/blackmisc/json.h b/src/blackmisc/json.h index 1f7d42948..b20e1291d 100644 --- a/src/blackmisc/json.h +++ b/src/blackmisc/json.h @@ -47,10 +47,10 @@ namespace BlackMisc const QLatin1String m_latin1; //! Implicit constructor. - Q_DECL_CONSTEXPR CExplicitLatin1String(QLatin1String s) : m_latin1(s) {} + constexpr CExplicitLatin1String(QLatin1String s) : m_latin1(s) {} //! Implicit conversion. - Q_DECL_CONSTEXPR operator QLatin1String() const { return m_latin1; } + constexpr operator QLatin1String() const { return m_latin1; } }; } diff --git a/src/blackmisc/pq/measurementunit.h b/src/blackmisc/pq/measurementunit.h index a65860239..bd76e2191 100644 --- a/src/blackmisc/pq/measurementunit.h +++ b/src/blackmisc/pq/measurementunit.h @@ -209,12 +209,12 @@ namespace BlackMisc { //! Construct a unit with custom conversion template - Q_DECL_CONSTEXPR Data(QLatin1String name, QLatin1String symbol, Converter, int displayDigits = 2, double epsilon = 1e-9) + constexpr Data(QLatin1String name, QLatin1String symbol, Converter, int displayDigits = 2, double epsilon = 1e-9) : m_name(name), m_symbol(symbol), m_epsilon(epsilon), m_displayDigits(displayDigits), m_toDefault(Converter::toDefault), m_fromDefault(Converter::fromDefault) {} //! Construct a null unit - Q_DECL_CONSTEXPR Data(QLatin1String name, QLatin1String symbol) + constexpr Data(QLatin1String name, QLatin1String symbol) : m_name(name), m_symbol(symbol) {} @@ -228,7 +228,7 @@ namespace BlackMisc //! Workaround to constant-initialize QLatin1String on platforms without constexpr strlen. template - static Q_DECL_CONSTEXPR QLatin1String constQLatin1(const char (&str)[N]) + static constexpr QLatin1String constQLatin1(const char (&str)[N]) { return QLatin1String(str, N - 1); // -1 because N includes the null terminator }