Commit b7537fec authored by Robert Maynard's avatar Robert Maynard
Browse files

Merge branch 'unused_typedef_warnings' into 'master'

Unused typedef warnings

See merge request !37
parents 14801c87 4088db79
......@@ -371,11 +371,9 @@ public:
if (sizeof(U) > sizeof(vtkm::Id)) {
/// More efficient sort:
/// Move value indexes when sorting and reorder the value array at last
typedef vtkm::cont::ArrayHandle<T,StorageT> KeyType;
typedef vtkm::cont::ArrayHandle<U,StorageU> ValueType;
typedef vtkm::cont::ArrayHandleZip<KeyType,ValueType> ZipHandleType;
typedef vtkm::cont::ArrayHandle<vtkm::Id,StorageU> IndexType;
typedef vtkm::cont::ArrayHandleZip<KeyType,IndexType> ZipIndexHandleType;
IndexType indexArray;
ValueType valuesScattered;
......
......@@ -83,7 +83,19 @@
#cmakedefine VTKM_NO_VARIADIC_TEMPLATE
#if !defined(VTKM_USE_VARIADIC_TEMPLATE) && !defined(VTKM_NO_VARIADIC_TEMPLATE)
// Currently using Boost to determine support.
# if defined(__GNUC__) || defined(____clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion"
# endif // gcc || clang
# include <boost/config.hpp>
# if defined(__GNUC__) || defined(____clang__)
# pragma GCC diagnostic pop
# endif // gcc || clang
# if defined(BOOST_HAS_VARIADIC_TMPL)
# define VTKM_USE_VARIADIC_TEMPLATE 1
# endif
......
......@@ -24,6 +24,13 @@
#include <vtkm/internal/IndexTag.h>
// Disable conversion warnings inside boost
# if defined(__GNUC__) || defined(____clang__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wconversion"
# endif // gcc || clang
#include <boost/function_types/components.hpp>
#include <boost/function_types/function_arity.hpp>
#include <boost/function_types/function_type.hpp>
......@@ -39,6 +46,12 @@
#include <boost/mpl/push_back.hpp>
#include <boost/utility/enable_if.hpp>
# if defined(__GNUC__) || defined(____clang__)
# pragma GCC diagnostic pop
# endif // gcc || clang
#include <vtkm/internal/FunctionInterfaceDetailPre.h>
namespace vtkm {
......
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