From f3242864c3e8384aa1153a9044143265f3af0b62 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@kde.org>
Date: Wed, 2 Nov 2011 10:26:50 +0100
Subject: Use C++11 static_assert
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I75aa2bc209cdc8869e7daa9fd0dd865ccf65a68e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@kde.org>
---
 tests/auto/corelib/global/qglobal/tst_qglobal.cpp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

(limited to 'tests/auto/corelib/global')

diff --git a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
index 9c6e5ced47..c0a14faac3 100644
--- a/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
+++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp
@@ -278,14 +278,20 @@ public:
     {
         Q_STATIC_ASSERT(true);
         Q_STATIC_ASSERT(!false);
+        Q_STATIC_ASSERT_X(true,"");
+        Q_STATIC_ASSERT_X(!false,"");
     }
     ~MyTrue()
     {
         Q_STATIC_ASSERT(true);
         Q_STATIC_ASSERT(!false);
+        Q_STATIC_ASSERT_X(true,"");
+        Q_STATIC_ASSERT_X(!false,"");
     }
     Q_STATIC_ASSERT(true);
     Q_STATIC_ASSERT(!false);
+    Q_STATIC_ASSERT_X(true,"");
+    Q_STATIC_ASSERT_X(!false,"");
 };
 
 struct MyExpresion
@@ -294,16 +300,21 @@ struct MyExpresion
     {
         Q_STATIC_ASSERT(sizeof(MyTrue) > 0);
         Q_STATIC_ASSERT(sizeof(MyTrue) > 0);
+        Q_STATIC_ASSERT_X(sizeof(MyTrue) > 0,"");
+        Q_STATIC_ASSERT_X(sizeof(MyTrue) > 0,"");
     }
 private:
     Q_STATIC_ASSERT(sizeof(MyTrue) > 0);
     Q_STATIC_ASSERT(sizeof(MyTrue) > 0);
+    Q_STATIC_ASSERT_X(sizeof(MyTrue) > 0, "");
+    Q_STATIC_ASSERT_X(sizeof(MyTrue) > 0, "");
 };
 
 struct TypeDef
 {
     typedef int T;
     Q_STATIC_ASSERT(sizeof(T));
+    Q_STATIC_ASSERT_X(sizeof(T), "");
 };
 
 template<typename T1, typename T2>
@@ -315,6 +326,10 @@ struct Template
     Q_STATIC_ASSERT(!!True);
     Q_STATIC_ASSERT(sizeof(DependentType));
     Q_STATIC_ASSERT(!!sizeof(DependentType));
+    Q_STATIC_ASSERT_X(True, "");
+    Q_STATIC_ASSERT_X(!!True, "");
+    Q_STATIC_ASSERT_X(sizeof(DependentType), "");
+    Q_STATIC_ASSERT_X(!!sizeof(DependentType), "");
 };
 
 struct MyTemplate
@@ -322,6 +337,8 @@ struct MyTemplate
     static const bool Value = Template<TypeDef, int>::True;
     Q_STATIC_ASSERT(Value);
     Q_STATIC_ASSERT(!!Value);
+    Q_STATIC_ASSERT_X(Value, "");
+    Q_STATIC_ASSERT_X(!!Value, "");
 };
 
 void tst_QGlobal::qstaticassert()
-- 
cgit v1.2.3