aboutsummaryrefslogtreecommitdiffhomepage
path: root/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-02-27 21:59:10 -0800
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2015-02-27 21:59:10 -0800
commit4250a0cab079ca6e8c43f3dae4c59322d65fc0e9 (patch)
treee8785a5f5b0ab6a66dc3f696189f6f8bdd8ec564 /unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h
parenta4e37b0617cc53a240428c099257941521ec3db8 (diff)
Fixed compilation warnings
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h')
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h4
1 files changed, 2 insertions, 2 deletions
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 {