diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-27 21:59:10 -0800 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2015-02-27 21:59:10 -0800 |
| commit | 4250a0cab079ca6e8c43f3dae4c59322d65fc0e9 (patch) | |
| tree | e8785a5f5b0ab6a66dc3f696189f6f8bdd8ec564 /unsupported | |
| parent | a4e37b0617cc53a240428c099257941521ec3db8 (diff) | |
Fixed compilation warnings
Diffstat (limited to 'unsupported')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h | 4 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h b/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h index 91aae091c..ae17c9610 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h @@ -66,7 +66,7 @@ template<typename T, DenseIndex NumIndices_, int Options_> class TensorStorage<T, NumIndices_, Dynamic, Options_, void> : public TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> { - typedef typename internal::compute_index_type<Options_ & Index32Bit>::type Index; + typedef typename internal::compute_index_type<static_cast<bool>(Options_ & Index32Bit)>::type Index; typedef DSizes<Index, NumIndices_> Dimensions; typedef TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> Base_; @@ -85,7 +85,7 @@ template<typename T, DenseIndex NumIndices_, int Options_> class TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> { public: - typedef typename internal::compute_index_type<Options_&Index32Bit>::type Index; + typedef typename internal::compute_index_type<static_cast<bool>(Options_&Index32Bit)>::type Index; typedef DSizes<Index, NumIndices_> Dimensions; typedef TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> Self_; diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h index 424bb24eb..9a35b044d 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h @@ -60,7 +60,7 @@ struct traits<Tensor<Scalar_, NumIndices_, Options_> > { typedef Scalar_ Scalar; typedef Dense StorageKind; - typedef typename compute_index_type<Options_&Index32Bit>::type Index; + typedef typename compute_index_type<static_cast<bool>(Options_&Index32Bit)>::type Index; static const int NumDimensions = NumIndices_; static const int Layout = Options_ & RowMajor ? RowMajor : ColMajor; enum { @@ -75,7 +75,7 @@ struct traits<TensorFixedSize<Scalar_, Dimensions, Options_> > { typedef Scalar_ Scalar; typedef Dense StorageKind; - typedef typename compute_index_type<Options_&Index32Bit>::type Index; + typedef typename compute_index_type<static_cast<bool>(Options_&Index32Bit)>::type Index; static const int NumDimensions = array_size<Dimensions>::value; static const int Layout = Options_ & RowMajor ? RowMajor : ColMajor; enum { |