Suppress warnings generated by TBB code, which we can change.

These warnings are caused by tbb code, which we have zero control over.
This commit is contained in:
Robert Maynard 2015-06-02 09:42:40 -04:00
parent 9332becc47
commit e0e6ffb705

@ -33,6 +33,13 @@
#include <boost/type_traits/remove_reference.hpp>
// Disable warnings we check vtkm for but TBB does not.
#if defined(__GNUC__) || defined(____clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wconversion"
#endif // gcc || clang
//we provide an patched implementation of tbb parallel_sort
//that fixes ADL for std::swap. This patch has been submitted to Intel
@ -47,6 +54,11 @@
#include <tbb/tick_count.h>
#if defined(__GNUC__) || defined(____clang__)
#pragma GCC diagnostic pop
#endif // gcc || clang
namespace vtkm {
namespace cont {