From 88ddf8021ef786d214db47a31df0854b5cf26ea3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 5 Aug 2016 13:17:05 +0300 Subject: [PATCH] Use macros Q_DECL_CONSTEXPR instead of direct constexpr. constexpr supported since MSVC 2015. --HG-- branch : develop --- src/libs/ifc/xml/vpatternconverter.cpp | 4 ++-- src/libs/ifc/xml/vpatternconverter.h | 4 ++-- src/libs/ifc/xml/vvitconverter.cpp | 4 ++-- src/libs/ifc/xml/vvitconverter.h | 4 ++-- src/libs/ifc/xml/vvstconverter.cpp | 4 ++-- src/libs/ifc/xml/vvstconverter.h | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/libs/ifc/xml/vpatternconverter.cpp b/src/libs/ifc/xml/vpatternconverter.cpp index 5723fadca..7c9b25c75 100644 --- a/src/libs/ifc/xml/vpatternconverter.cpp +++ b/src/libs/ifc/xml/vpatternconverter.cpp @@ -46,8 +46,8 @@ const QString VPatternConverter::PatternMinVerStr = QStringLiteral("0.1.0"); const QString VPatternConverter::PatternMaxVerStr = QStringLiteral("0.3.3"); const QString VPatternConverter::CurrentSchema = QStringLiteral("://schema/pattern/v0.3.3.xsd"); -constexpr int VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! -constexpr int VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! +//VPatternConverter::PatternMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! +//VPatternConverter::PatternMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! //--------------------------------------------------------------------------------------------------------------------- VPatternConverter::VPatternConverter(const QString &fileName) diff --git a/src/libs/ifc/xml/vpatternconverter.h b/src/libs/ifc/xml/vpatternconverter.h index 76c0caa71..509cbf963 100644 --- a/src/libs/ifc/xml/vpatternconverter.h +++ b/src/libs/ifc/xml/vpatternconverter.h @@ -40,8 +40,8 @@ public: static const QString PatternMaxVerStr; static const QString CurrentSchema; - static constexpr int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); - static constexpr int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); + static Q_DECL_CONSTEXPR const int PatternMinVer = CONVERTER_VERSION_CHECK(0, 1, 0); + static Q_DECL_CONSTEXPR const int PatternMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); protected: virtual int MinVer() const Q_DECL_OVERRIDE; diff --git a/src/libs/ifc/xml/vvitconverter.cpp b/src/libs/ifc/xml/vvitconverter.cpp index 94c317b49..d9d9f9d26 100644 --- a/src/libs/ifc/xml/vvitconverter.cpp +++ b/src/libs/ifc/xml/vvitconverter.cpp @@ -43,8 +43,8 @@ const QString VVITConverter::MeasurementMinVerStr = QStringLiteral("0.2.0"); const QString VVITConverter::MeasurementMaxVerStr = QStringLiteral("0.3.3"); const QString VVITConverter::CurrentSchema = QStringLiteral("://schema/individual_measurements/v0.3.3.xsd"); -constexpr int VVITConverter::MeasurementMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! -constexpr int VVITConverter::MeasurementMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! +//VVITConverter::MeasurementMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! +//VVITConverter::MeasurementMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! //--------------------------------------------------------------------------------------------------------------------- VVITConverter::VVITConverter(const QString &fileName) diff --git a/src/libs/ifc/xml/vvitconverter.h b/src/libs/ifc/xml/vvitconverter.h index b72d43e5c..9466f8848 100644 --- a/src/libs/ifc/xml/vvitconverter.h +++ b/src/libs/ifc/xml/vvitconverter.h @@ -40,8 +40,8 @@ public: static const QString MeasurementMaxVerStr; static const QString CurrentSchema; - static constexpr int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 2, 0); - static constexpr int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); + static Q_DECL_CONSTEXPR const int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 2, 0); + static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 3, 3); protected: virtual int MinVer() const Q_DECL_OVERRIDE; diff --git a/src/libs/ifc/xml/vvstconverter.cpp b/src/libs/ifc/xml/vvstconverter.cpp index 37136c3f9..5b6e09d74 100644 --- a/src/libs/ifc/xml/vvstconverter.cpp +++ b/src/libs/ifc/xml/vvstconverter.cpp @@ -43,8 +43,8 @@ const QString VVSTConverter::MeasurementMinVerStr = QStringLiteral("0.3.0"); const QString VVSTConverter::MeasurementMaxVerStr = QStringLiteral("0.4.2"); const QString VVSTConverter::CurrentSchema = QStringLiteral("://schema/standard_measurements/v0.4.2.xsd"); -constexpr int VVSTConverter::MeasurementMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! -constexpr int VVSTConverter::MeasurementMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! +//VVSTConverter::MeasurementMinVer; // <== DON'T FORGET TO UPDATE TOO!!!! +//VVSTConverter::MeasurementMaxVer; // <== DON'T FORGET TO UPDATE TOO!!!! //--------------------------------------------------------------------------------------------------------------------- VVSTConverter::VVSTConverter(const QString &fileName) diff --git a/src/libs/ifc/xml/vvstconverter.h b/src/libs/ifc/xml/vvstconverter.h index 7619f3ebe..8fafd553c 100644 --- a/src/libs/ifc/xml/vvstconverter.h +++ b/src/libs/ifc/xml/vvstconverter.h @@ -40,8 +40,8 @@ public: static const QString MeasurementMaxVerStr; static const QString CurrentSchema; - static constexpr int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 3, 0); - static constexpr int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 2); + static Q_DECL_CONSTEXPR const int MeasurementMinVer = CONVERTER_VERSION_CHECK(0, 3, 0); + static Q_DECL_CONSTEXPR const int MeasurementMaxVer = CONVERTER_VERSION_CHECK(0, 4, 2); protected: virtual int MinVer() const Q_DECL_OVERRIDE;