From f59e96bcaf38a88229d5f7fff7036b1c3dce5306 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Fri, 10 Jul 2020 11:08:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B8=D0=BC=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D1=81=20=D0=A1=D0=BC=D0=BE=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D1=81=D0=BA=201.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/myx/backports/compiler/gcc.hpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/myx/backports/compiler/gcc.hpp b/src/myx/backports/compiler/gcc.hpp index 67a614b..15639d8 100644 --- a/src/myx/backports/compiler/gcc.hpp +++ b/src/myx/backports/compiler/gcc.hpp @@ -13,11 +13,10 @@ #pragma clang diagnostic ignored "-Wkeyword-macro" #endif -// NOLINTNEXTLINE +#if ( __cplusplus < 201103L ) #define override - -// NOLINTNEXTLINE -#define constexpr const +#define constexpr +#endif #ifdef __clang__ #pragma clang diagnostic pop