mirror of https://github.com/KLayout/klayout.git
Disabled thread local storage test for Qt <4.7 because this class is broken with an int argument on Qt 4.6.2
This commit is contained in:
parent
ccc5be86d7
commit
72c3288090
|
|
@ -199,6 +199,9 @@ TEST(2_nonlocked)
|
|||
EXPECT_EQ (my_thread.value () < 20000000, true);
|
||||
}
|
||||
|
||||
// NOTE: ThreadStorage is broken on Qt 4.6.2 (invalid static_cast from type 'void*' to type 'int')
|
||||
#if !defined(HAVE_QT) || QT_VERSION >= 0x40700
|
||||
|
||||
static tl::ThreadStorage<int> s_tls;
|
||||
|
||||
class MyThread3 : public tl::Thread
|
||||
|
|
@ -242,6 +245,8 @@ TEST(3)
|
|||
EXPECT_EQ (my_thread.value (), 10000000);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static tl::WaitCondition s_condition;
|
||||
static tl::Mutex s_wait_mutex;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue