Fixed compilation warnings

This commit is contained in:
Benoit Steiner 2015-02-27 21:59:10 -08:00
parent a4e37b0617
commit 4250a0cab0
2 changed files with 4 additions and 4 deletions

View File

@ -66,7 +66,7 @@ template<typename T, DenseIndex NumIndices_, int Options_>
class TensorStorage<T, NumIndices_, Dynamic, Options_, void> class TensorStorage<T, NumIndices_, Dynamic, Options_, void>
: public TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> : 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 DSizes<Index, NumIndices_> Dimensions;
typedef TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> Base_; 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> class TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type>
{ {
public: 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 DSizes<Index, NumIndices_> Dimensions;
typedef TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> Self_; typedef TensorStorage<T, NumIndices_, Dynamic, Options_, typename internal::gen_numeric_list_repeated<DenseIndex, NumIndices_, Dynamic>::type> Self_;

View File

@ -60,7 +60,7 @@ struct traits<Tensor<Scalar_, NumIndices_, Options_> >
{ {
typedef Scalar_ Scalar; typedef Scalar_ Scalar;
typedef Dense StorageKind; 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 NumDimensions = NumIndices_;
static const int Layout = Options_ & RowMajor ? RowMajor : ColMajor; static const int Layout = Options_ & RowMajor ? RowMajor : ColMajor;
enum { enum {
@ -75,7 +75,7 @@ struct traits<TensorFixedSize<Scalar_, Dimensions, Options_> >
{ {
typedef Scalar_ Scalar; typedef Scalar_ Scalar;
typedef Dense StorageKind; 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 NumDimensions = array_size<Dimensions>::value;
static const int Layout = Options_ & RowMajor ? RowMajor : ColMajor; static const int Layout = Options_ & RowMajor ? RowMajor : ColMajor;
enum { enum {