Commit 0e01344a authored by David E. DeMarle's avatar David E. DeMarle

Merge commit '978ce755' into release

parents f68cc0bc 978ce755
......@@ -20,8 +20,17 @@
#include "vtkAtomicTypeConcepts.h"
#ifdef _MSC_VER
# pragma push_macro("__TBB_NO_IMPLICIT_LINKAGE")
# define __TBB_NO_IMPLICIT_LINKAGE 1
#endif
#include <tbb/atomic.h>
#ifdef _MSC_VER
# pragma pop_macro("__TBB_NO_IMPLICIT_LINKAGE")
#endif
#include <cstddef>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment