From 25b46d651ef77aa4fb22daaba2d06cdcdcfbcd27 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 29 Jul 2016 12:07:44 +0300 Subject: [PATCH] "noexcept" is only supported since the Visual Studio 2015 --HG-- branch : develop --- src/libs/ifc/ifcdef.h | 4 ++-- src/libs/qmuparser/qmuparserdef.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/ifc/ifcdef.h b/src/libs/ifc/ifcdef.h index 0ce6dddd9..39edb97c1 100644 --- a/src/libs/ifc/ifcdef.h +++ b/src/libs/ifc/ifcdef.h @@ -54,8 +54,8 @@ static const quint32 null_id = 0; # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__) # define V_NOEXCEPT_EXPR(x) noexcept(x) // GCC 4.7 and following have noexcept # endif -# elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 180021114 -# define V_NOEXCEPT_EXPR(x) noexcept(x) +# elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026 +# define V_NOEXCEPT_EXPR(x) noexcept(x) // Visual Studio 2015 and following have noexcept # else # define V_NOEXCEPT_EXPR(x) # endif diff --git a/src/libs/qmuparser/qmuparserdef.h b/src/libs/qmuparser/qmuparserdef.h index 7b2a306a2..3b57223aa 100644 --- a/src/libs/qmuparser/qmuparserdef.h +++ b/src/libs/qmuparser/qmuparserdef.h @@ -46,8 +46,8 @@ # if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__GXX_EXPERIMENTAL_CXX0X__) # define QMUP_NOEXCEPT_EXPR(x) noexcept(x) // GCC 4.7 and following have noexcept # endif -# elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 180021114 -# define QMUP_NOEXCEPT_EXPR(x) noexcept(x) +# elif defined(_MSC_FULL_VER) && _MSC_FULL_VER >= 190023026 +# define QMUP_NOEXCEPT_EXPR(x) noexcept(x) // Visual Studio 2015 and following have noexcept # else # define QMUP_NOEXCEPT_EXPR(x) # endif