rixxc/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-12-04 15:39:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make google cpplint happy.

Browse Source
This commit is contained in:
Felix Geyer
2012-07-02 20:00:06 +02:00
parent 1bb646fb91
commit 6ca3b8aa81
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/Global.h
View File

@@ -26,7 +26,6 @@
#ifdef Q_CC_CLANG #ifdef Q_CC_CLANG
# if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) # 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) # if __has_feature(cxx_strong_enums)
# define COMPILER_CLASS_ENUM # define COMPILER_CLASS_ENUM
# endif # endif
@@ -51,7 +50,6 @@
#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG) #if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG)
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L # if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403 # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403
/* C++11 features supported in GCC 4.3: */
# define COMPILER_DECLTYPE # define COMPILER_DECLTYPE
# define COMPILER_STATIC_ASSERT # define COMPILER_STATIC_ASSERT
# endif # endif
@@ -105,8 +103,8 @@
#if !defined(Q_STATIC_ASSERT) && !defined(Q_STATIC_ASSERT_X) #if !defined(Q_STATIC_ASSERT) && !defined(Q_STATIC_ASSERT_X)
#ifdef COMPILER_STATIC_ASSERT #ifdef COMPILER_STATIC_ASSERT
#define Q_STATIC_ASSERT(Condition) static_assert(bool(Condition), #Condition) #define Q_STATIC_ASSERT(Condition) static_assert(static_cast<bool>(Condition), #Condition)
#define Q_STATIC_ASSERT_X(Condition, Message) static_assert(bool(Condition), Message) #define Q_STATIC_ASSERT_X(Condition, Message) static_assert(static_cast<bool>(Condition), Message)
#else #else
// Intentionally undefined // Intentionally undefined
template <bool Test> class QStaticAssertFailure; template <bool Test> class QStaticAssertFailure;