From 6ca3b8aa813e1aa26f46023850dd0dd8df23a693 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Mon, 2 Jul 2012 20:00:06 +0200 Subject: [PATCH] Make google cpplint happy. --- src/core/Global.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/core/Global.h b/src/core/Global.h index 56068714e..a2a4e5d3c 100644 --- a/src/core/Global.h +++ b/src/core/Global.h @@ -26,7 +26,6 @@ #ifdef Q_CC_CLANG # if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) - /* Detect C++ features using __has_feature(), see http://clang.llvm.org/docs/LanguageExtensions.html#cxx11 */ # if __has_feature(cxx_strong_enums) # define COMPILER_CLASS_ENUM # endif @@ -51,7 +50,6 @@ #if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403 - /* C++11 features supported in GCC 4.3: */ # define COMPILER_DECLTYPE # define COMPILER_STATIC_ASSERT # endif @@ -105,8 +103,8 @@ #if !defined(Q_STATIC_ASSERT) && !defined(Q_STATIC_ASSERT_X) #ifdef COMPILER_STATIC_ASSERT -#define Q_STATIC_ASSERT(Condition) static_assert(bool(Condition), #Condition) -#define Q_STATIC_ASSERT_X(Condition, Message) static_assert(bool(Condition), Message) +#define Q_STATIC_ASSERT(Condition) static_assert(static_cast(Condition), #Condition) +#define Q_STATIC_ASSERT_X(Condition, Message) static_assert(static_cast(Condition), Message) #else // Intentionally undefined template class QStaticAssertFailure;