Skip to content

Commit e2331e4

Browse files
committed
Do not confuse qt and tbb
1 parent 14c3f0c commit e2331e4

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

PyramidTiffData/src/PyramidTiffData.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
#include <string>
2020

2121
#if !defined(__clang__) && (defined(__GNUC__) || defined(_MSC_VER))
22+
#if defined(__GNUC__) // both TBB and Qt define emit keyword
23+
#undef emit
24+
#endif
2225
#include <execution>
26+
#if defined(__GNUC__) // both TBB and Qt define emit keyword
27+
#define emit
28+
#endif
2329
#ifdef NDEBUG
2430
#define MV_PYRAMID_PARALLEL_EXECUTION std::execution::par,
2531
#else

0 commit comments

Comments
 (0)